Skip to content

Commit

Permalink
Merge pull request tqdm#1099 from tqdm/devel
Browse files Browse the repository at this point in the history 
bump version
  • Loading branch information
@casperdcl
casperdcl authored Dec 25, 2020
2 parents 6cb32c2 + 0f95bed commit 822ca36
Show file tree
Hide file tree
Showing 48 changed files with 487 additions and 787 deletions.
4 changes: 1 addition & 3 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@

.git* export-ignore
.mailmap export-ignore
.meta/ export-ignore
images/ export-ignore
benchmarks/ export-ignore
MANIFEST.in export-ignore
codecov.yml export-ignore
asv.conf.json export-ignore
.style.yapf export-ignore
.tqdm.1.md export-ignore
4 changes: 2 additions & 2 deletions codecov.yml → .github/codecov.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
comment:
layout: header, changes, diff
layout: diff
coverage:
status:
patch:
default:
target: '80'
threshold: 80%
project: false
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
if: github.event_name != 'pull_request' || github.head_ref != 'devel'
strategy:
matrix:
python: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy3]
python: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
name: py${{ matrix.python }}
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -128,10 +128,10 @@ jobs:
echo "::set-output name=asset_name_sig::$(basename dist/*.whl.asc 2>/dev/null)"
if [[ $GITHUB_REF == refs/tags/v* ]]; then
echo ::set-output name=docker_tags::latest,${GITHUB_REF/refs\/tags\/v/}
echo ::set-output name=snap_channel::stable
echo ::set-output name=snap_channel::stable,candidate,edge
elif [[ $GITHUB_REF == refs/heads/master ]]; then
echo ::set-output name=docker_tags::master
echo ::set-output name=snap_channel::candidate
echo ::set-output name=snap_channel::candidate,edge
elif [[ $GITHUB_REF == refs/heads/devel ]]; then
echo ::set-output name=docker_tags::devel
echo ::set-output name=snap_channel::edge
Expand Down
49 changes: 15 additions & 34 deletions .meta/.readme.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ tqdm

|Build-Status| |Coverage-Status| |Branch-Coverage-Status| |Codacy-Grade| |Libraries-Rank| |PyPI-Downloads|

|LICENCE| |OpenHub-Status| |binder-demo| |notebook-demo| |awesome-python|
|LICENCE| |OpenHub-Status| |binder-demo| |awesome-python|

``tqdm`` derives from the Arabic word *taqaddum* (تقدّم) which can mean "progress,"
and is an abbreviation for "I love you so much" in Spanish (*te quiero demasiado*).
Expand Down Expand Up @@ -475,7 +475,7 @@ Examples and Advanced Usage
on how to make a **great** progressbar;

- check out the `slides from PyData London <https://tqdm.github.io/PyData2019/slides.html>`__, or
- run the |notebook-demo| or |binder-demo|.
- run the |binder-demo|.

Description and additional stats
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -925,8 +925,7 @@ For further customisation,
Consider overloading ``display()`` to use e.g.
``self.frontend(**self.format_dict)`` instead of ``self.sp(repr(self))``.

Some submodule examples of inheritance which don't (yet) strictly conform to the
above recommendation:
Some submodule examples of inheritance:

- `tqdm/notebook.py <https://github.com/tqdm/tqdm/blob/master/tqdm/notebook.py>`__
- `tqdm/gui.py <https://github.com/tqdm/tqdm/blob/master/tqdm/gui.py>`__
Expand Down Expand Up @@ -1111,27 +1110,27 @@ file for more information.

Developers who have made significant contributions, ranked by *SLoC*
(surviving lines of code,
`git fame <https://github.com/casperdcl/git-fame>`__ ``-wMC``),
`git fame <https://github.com/casperdcl/git-fame>`__ ``-wMC --excl '\.(png|gif|jpg)$'``),
are:

==================== ======================================================== ==== ================================
Name ID SLoC Notes
==================== ======================================================== ==== ================================
Casper da Costa-Luis `casperdcl <https://github.com/casperdcl>`__ ~75% primary maintainer |Gift-Casper|
Stephen Larroque `lrq3000 <https://github.com/lrq3000>`__ ~15% team member
Casper da Costa-Luis `casperdcl <https://github.com/casperdcl>`__ ~82% primary maintainer |Gift-Casper|
Stephen Larroque `lrq3000 <https://github.com/lrq3000>`__ ~11% team member
Martin Zugnoni `martinzugnoni <https://github.com/martinzugnoni>`__ ~3%
Guangshuo Chen `chengs <https://github.com/chengs>`__ ~1%
Hadrien Mary `hadim <https://github.com/hadim>`__ ~1% team member
Matthew Stevens `mjstevens777 <https://github.com/mjstevens777>`__ ~1%
Noam Yorav-Raphael `noamraph <https://github.com/noamraph>`__ ~1% original author
Kyle Altendorf `altendky <https://github.com/altendky>`__ ~1%
Ivan Ivanov `obiwanus <https://github.com/obiwanus>`__ ~1%
James E. King III `jeking3 <https://github.com/jeking3>`__ ~1%
Mikhail Korobov `kmike <https://github.com/kmike>`__ ~1% team member
Kyle Altendorf `altendky <https://github.com/altendky>`__ <1%
Matthew Stevens `mjstevens777 <https://github.com/mjstevens777>`__ <1%
Jona Haag `<https://github.com/>`__ <1%
Hadrien Mary `hadim <https://github.com/hadim>`__ <1% team member
Daniel Panteleit `<https://github.com/>`__ <1%
Ivan Ivanov `obiwanus <https://github.com/obiwanus>`__ <1%
James E. King III `jeking3 <https://github.com/jeking3>`__ <1%
Noam Yorav-Raphael `noamraph <https://github.com/noamraph>`__ <1% original author
Mikhail Korobov `kmike <https://github.com/kmike>`__ <1% team member
==================== ======================================================== ==== ================================

|sourcerer-0| |sourcerer-1| |sourcerer-2| |sourcerer-3| |sourcerer-4| |sourcerer-5| |sourcerer-7|

Ports to Other Languages
~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -1206,28 +1205,10 @@ Citation information: |DOI|
:target: https://raw.githubusercontent.com/tqdm/tqdm/master/LICENCE
.. |DOI| image:: https://img.shields.io/badge/DOI-10.5281/zenodo.595120-blue.svg
:target: https://doi.org/10.5281/zenodo.595120
.. |notebook-demo| image:: https://img.shields.io/badge/launch-notebook-orange.svg?logo=jupyter
:target: https://notebooks.ai/demo/gh/tqdm/tqdm
.. |binder-demo| image:: https://mybinder.org/badge_logo.svg
:target: https://mybinder.org/v2/gh/tqdm/tqdm/master?filepath=DEMO.ipynb
.. |Screenshot-Jupyter1| image:: https://raw.githubusercontent.com/tqdm/tqdm/master/images/tqdm-jupyter-1.gif
.. |Screenshot-Jupyter2| image:: https://raw.githubusercontent.com/tqdm/tqdm/master/images/tqdm-jupyter-2.gif
.. |Screenshot-Jupyter3| image:: https://raw.githubusercontent.com/tqdm/tqdm/master/images/tqdm-jupyter-3.gif
.. |README-Hits| image:: https://caspersci.uk.to/cgi-bin/hits.cgi?q=tqdm&style=social&r=https://github.com/tqdm/tqdm&l=https://caspersci.uk.to/images/tqdm.png&f=https://raw.githubusercontent.com/tqdm/tqdm/master/images/logo.gif
:target: https://caspersci.uk.to/cgi-bin/hits.cgi?q=tqdm&a=plot&r=https://github.com/tqdm/tqdm&l=https://caspersci.uk.to/images/tqdm.png&f=https://raw.githubusercontent.com/tqdm/tqdm/master/images/logo.gif&style=social
.. |sourcerer-0| image:: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/images/0
:target: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/links/0
.. |sourcerer-1| image:: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/images/1
:target: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/links/1
.. |sourcerer-2| image:: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/images/2
:target: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/links/2
.. |sourcerer-3| image:: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/images/3
:target: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/links/3
.. |sourcerer-4| image:: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/images/4
:target: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/links/4
.. |sourcerer-5| image:: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/images/5
:target: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/links/5
.. |sourcerer-6| image:: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/images/6
:target: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/links/6
.. |sourcerer-7| image:: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/images/7
:target: https://sourcerer.io/fame/casperdcl/tqdm/tqdm/links/7
10 changes: 3 additions & 7 deletions .meta/mkcompletion.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
import tqdm.cli # NOQA

RE_OPT = re.compile(r'(\w+) :', flags=re.M)
RE_OPT_INPUT = re.compile(
r'(\w+) : (?:str|int|float|chr|dict|tuple)', flags=re.M)
RE_OPT_INPUT = re.compile(r'(\w+) : (?:str|int|float|chr|dict|tuple)', flags=re.M)


def doc2opt(doc, user_input=True):
Expand All @@ -32,8 +31,7 @@ def doc2opt(doc, user_input=True):
for doc in (tqdm.tqdm.__init__.__doc__, tqdm.cli.CLI_EXTRA_DOC):
options.update(doc2opt(doc, user_input=False))
options_input.update(doc2opt(doc, user_input=True))
options.difference_update(
'--' + i for i in ('name',) + tqdm.cli.UNSUPPORTED_OPTS)
options.difference_update('--' + i for i in ('name',) + tqdm.cli.UNSUPPORTED_OPTS)
options_input &= options
options_input -= {"--log"} # manually dealt with
src_dir = path.abspath(path.dirname(__file__))
Expand All @@ -58,9 +56,7 @@ def doc2opt(doc, user_input=True):
esac
}}
complete -F _tqdm tqdm
""".format(
opts=' '.join(sorted(options)),
opts_manual='|'.join(sorted(options_input)))
""".format(opts=' '.join(sorted(options)), opts_manual='|'.join(sorted(options_input)))

if __name__ == "__main__":
fncompletion = path.join(path.dirname(src_dir), 'tqdm', 'completion.sh')
Expand Down
1 change: 0 additions & 1 deletion .meta/mkdocs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import tqdm # NOQA
import tqdm.cli # NOQA


HEAD_ARGS = """
Parameters
----------
Expand Down
8 changes: 3 additions & 5 deletions .meta/mksnap.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,10 @@
tqdm:
command: bin/tqdm
completer: completion.sh
""".format(
version=tqdm.__version__,
commit=check_output(['git', 'describe', '--always']).decode('U8').strip())
""".format(version=tqdm.__version__, commit=check_output([
'git', 'describe', '--always']).decode('U8').strip())
fname = path.join(path.dirname(src_dir), 'snapcraft.yaml')

if __name__ == "__main__":
with io_open(fname, mode='w', encoding='utf-8') as fd:
fd.write(snap_yml.decode('U8') if hasattr(snap_yml, 'decode')
else snap_yml)
fd.write(snap_yml.decode('U8') if hasattr(snap_yml, 'decode') else snap_yml)
10 changes: 0 additions & 10 deletions .style.yapf
View file

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ This section is intended for the project's maintainers and describes
how to build and upload a new release. Once again,
`[python setup.py] make [<alias>]` will help.
Also consider `pip install`ing development utilities:
`-r requirements-dev.txt` or `tqdm[dev]`.
`pip install tqdm[dev]` at a minimum, or a more thorough `conda env create`.


## Pre-commit Hook
Expand Down
4 changes: 2 additions & 2 deletions DEMO.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"[![Build-Status](https://img.shields.io/github/workflow/status/tqdm/tqdm/Test/master?logo=GitHub)](https://github.com/tqdm/tqdm/actions?query=workflow%3ATest)|[![Coverage-Status](https://img.shields.io/coveralls/github/tqdm/tqdm/master?logo=coveralls)](https://coveralls.io/github/tqdm/tqdm)|[![Branch-Coverage-Status](https://codecov.io/gh/tqdm/tqdm/branch/master/graph/badge.svg)](https://codecov.io/gh/tqdm/tqdm)|[![Codacy-Grade](https://api.codacy.com/project/badge/Grade/3f965571598f44549c7818f29cdcf177)](https://www.codacy.com/app/tqdm/tqdm/dashboard)|[![Libraries-Rank](https://img.shields.io/librariesio/sourcerank/pypi/tqdm.svg?logo=koding&logoColor=white)](https://libraries.io/pypi/tqdm)|[![PyPI-Downloads](https://img.shields.io/pypi/dm/tqdm.svg?label=pypi%20downloads&logo=PyPI&logoColor=white)](https://pypi.org/project/tqdm)\n",
"-|-|-|-|-|-\n",
"\n",
"[![DOI](https://img.shields.io/badge/DOI-10.21105/joss.01277-green.svg)](https://doi.org/10.21105/joss.01277)|[![LICENCE](https://img.shields.io/pypi/l/tqdm.svg)](https://raw.githubusercontent.com/tqdm/tqdm/master/LICENCE)|[![OpenHub-Status](https://www.openhub.net/p/tqdm/widgets/project_thin_badge?format=gif)](https://www.openhub.net/p/tqdm?ref=Thin+badge)|[![binder-demo](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/tqdm/tqdm/master?filepath=DEMO.ipynb)|[![notebook-demo](https://img.shields.io/badge/launch-notebook-orange.svg?logo=jupyter)](https://notebooks.ai/demo/gh/tqdm/tqdm)|[![awesome-python](https://awesome.re/mentioned-badge.svg)](https://github.com/vinta/awesome-python)\n",
"-|-|-|-|-|-\n",
"[![DOI](https://img.shields.io/badge/DOI-10.21105/joss.01277-green.svg)](https://doi.org/10.21105/joss.01277)|[![LICENCE](https://img.shields.io/pypi/l/tqdm.svg)](https://raw.githubusercontent.com/tqdm/tqdm/master/LICENCE)|[![OpenHub-Status](https://www.openhub.net/p/tqdm/widgets/project_thin_badge?format=gif)](https://www.openhub.net/p/tqdm?ref=Thin+badge)|[![binder-demo](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/tqdm/tqdm/master?filepath=DEMO.ipynb)|[![awesome-python](https://awesome.re/mentioned-badge.svg)](https://github.com/vinta/awesome-python)\n",
"-|-|-|-|-\n",
"\n",
"`tqdm` derives from the Arabic word *taqaddum* (تقدّم) which can mean\n",
"\"progress,\" and is an abbreviation for \"I love you so much\" in Spanish\n",
Expand Down
20 changes: 0 additions & 20 deletions MANIFEST.in
View file

This file was deleted.

4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ testperf:
pytest -k tests_perf

testtimer:
pytest --durations=10
pytest

# another performance test, to check evolution across commits
testasv:
Expand Down Expand Up @@ -116,7 +116,7 @@ pre-commit:
# quick sanity checks
@make --no-print-directory testsetup
flake8 -j 8 --count --statistics setup.py .meta/ tqdm/ tests/ examples/
pytest -qq -k "basic_overhead or not (perf or keras or pandas or monitoring)"
pytest -qq --durations=1 -k "basic_overhead or not (perf or keras or pandas or monitoring)"
prebuildclean:
@+python -c "import shutil; shutil.rmtree('build', True)"
@+python -c "import shutil; shutil.rmtree('dist', True)"
Expand Down
Loading

0 comments on commit 822ca36

Please sign in to comment.