Reorganize tqdm modules architecture to avoid unnecessary imports

Signed-off-by: Stephen L. <lrq3000@gmail.com>

tqdm/__init__.py

@@ -1,28 +1,9 @@
-from ._tqdm import tqdm
-from ._tqdm import trange
-from ._tqdm_gui import tqdm_gui
-from ._tqdm_gui import tgrange
-from ._tqdm_pandas import tqdm_pandas
+from .core import tqdm
+from .core import trange
 from ._main import main
 from ._main import TqdmKeyError
 from ._main import TqdmTypeError
 from ._version import __version__  # NOQA
 
-__all__ = ['tqdm', 'tqdm_gui', 'trange', 'tgrange', 'tqdm_pandas',
-           'tqdm_notebook', 'tnrange', 'main', 'TqdmKeyError', 'TqdmTypeError',
+__all__ = ['tqdm', 'trange', 'main', 'TqdmKeyError', 'TqdmTypeError',
            '__version__']
-
-
-def tqdm_notebook(*args, **kwargs):  # pragma: no cover
-    """See tqdm._tqdm_notebook.tqdm_notebook for full documentation"""
-    from ._tqdm_notebook import tqdm_notebook as _tqdm_notebook
-    return _tqdm_notebook(*args, **kwargs)
-
-
-def tnrange(*args, **kwargs):  # pragma: no cover
-    """
-    A shortcut for tqdm_notebook(xrange(*args), **kwargs).
-    On Python3+ range is used instead of xrange.
-    """
-    from ._tqdm_notebook import tnrange as _tnrange
-    return _tnrange(*args, **kwargs)

tqdm/_main.py

@@ -1,4 +1,4 @@
-from ._tqdm import tqdm
+from .core import tqdm
 from ._version import __version__  # NOQA
 import sys
 import re

tqdm/_version.py

@@ -8,7 +8,7 @@
 __all__ = ["__version__"]
 
 # major, minor, patch, -extra
-version_info = 4, 7, 6
+version_info = 5, 0, 0
 
 # Nice string for the version
 __version__ = '.'.join(map(str, version_info))

tqdm/_tqdm_gui.py → tqdm/gui.py

@@ -3,8 +3,8 @@
 Includes a default (x)range iterator printing to stderr.
 
 Usage:
-  >>> from tqdm_gui import tgrange[, tqdm_gui]
-  >>> for i in tgrange(10): #same as: for i in tqdm_gui(xrange(10))
+  >>> from tqdm.gui import trange[, tqdm]
+  >>> for i in trange(10): #same as: for i in tqdm(xrange(10))
   ...     ...
 """
 # future division is important to divide integers and get as
@@ -15,14 +15,14 @@
 from time import time
 from ._utils import _range
 # to inherit from the tqdm class
-from ._tqdm import tqdm
+from .core import tqdm
 
 
 __author__ = {"github.com/": ["casperdcl", "lrq3000"]}
-__all__ = ['tqdm_gui', 'tgrange']
+__all__ = ['tqdm', 'trange']
 
 
-class tqdm_gui(tqdm):  # pragma: no cover
+class tqdm(tqdm):  # pragma: no cover
     """
     Experimental GUI version of tqdm!
     """
@@ -354,9 +354,9 @@ def close(self):
             self.plt.close(self.fig)
 
 
-def tgrange(*args, **kwargs):
+def trange(*args, **kwargs):
     """
-    A shortcut for tqdm_gui(xrange(*args), **kwargs).
+    A shortcut for tqdm(xrange(*args), **kwargs).
     On Python3+ range is used instead of xrange.
     """
-    return tqdm_gui(_range(*args), **kwargs)
+    return tqdm(_range(*args), **kwargs)

tqdm/_tqdm_notebook.py → tqdm/notebook.py

@@ -3,8 +3,8 @@
 Includes a default (x)range iterator printing to stderr.
 
 Usage:
-  >>> from tqdm_notebook import tnrange[, tqdm_notebook]
-  >>> for i in tnrange(10): #same as: for i in tqdm_notebook(xrange(10))
+  >>> from tqdm.notebook import trange[, tqdm]
+  >>> for i in trange(10): #same as: for i in tqdm(xrange(10))
   ...     ...
 """
 # future division is important to divide integers and get as
@@ -14,7 +14,7 @@
 import sys
 from ._utils import _range
 # to inherit from the tqdm class
-from ._tqdm import tqdm
+from .core import tqdm
 
 
 if True:  # pragma: no cover
@@ -64,10 +64,10 @@
 
 
 __author__ = {"github.com/": ["lrq3000", "casperdcl", "alexanderkuk"]}
-__all__ = ['tqdm_notebook', 'tnrange']
+__all__ = ['tqdm', 'trange']
 
 
-class tqdm_notebook(tqdm):
+class tqdm(tqdm):
     """
     Experimental IPython/Jupyter Notebook widget using tqdm!
     """
@@ -211,9 +211,9 @@ def moveto(*args, **kwargs):
         return
 
 
-def tnrange(*args, **kwargs):
+def trange(*args, **kwargs):
     """
-    A shortcut for tqdm_notebook(xrange(*args), **kwargs).
+    A shortcut for tqdm(xrange(*args), **kwargs).
     On Python3+ range is used instead of xrange.
     """
     return tqdm_notebook(_range(*args), **kwargs)

tqdm/tests/tests_pandas.py

@@ -9,7 +9,7 @@ def test_pandas_groupby_apply():
     """ Test pandas.DataFrame.groupby(...).progress_apply """
     try:
         from numpy.random import randint
-        from tqdm import tqdm_pandas
+        from tqdm.pandas import tqdm_pandas
         import pandas as pd
     except:
         raise SkipTest
@@ -39,7 +39,7 @@ def test_pandas_apply():
     """ Test pandas.DataFrame[.series].progress_apply """
     try:
         from numpy.random import randint
-        from tqdm import tqdm_pandas
+        from tqdm.pandas import tqdm_pandas
         import pandas as pd
     except:
         raise SkipTest
@@ -66,7 +66,7 @@ def test_pandas_leave():
     """ Test pandas with `leave=True` """
     try:
         from numpy.random import randint
-        from tqdm import tqdm_pandas
+        from tqdm.pandas import tqdm_pandas
         import pandas as pd
     except:
         raise SkipTest