bump version, merge branch 'devel'

tqdm · Sep 10, 2018 · 96d8a3c · 96d8a3c
2 parents a2514e8 + ecc99b0
commit 96d8a3c
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,8 @@
 *.py[cod]
 *.so
+/wiki/
+/docs/
+/feedstock/
 
 # Packages
 tqdm.egg-info

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -271,4 +271,15 @@ For expereinced devs, once happy with local master:
 6. `git tag vM.m.p && git push --tags`
 7. `[python setup.py] make distclean`
 8. `[python setup.py] make build`
-9. `[python setup.py] make pypi`
+9. upload to PyPI using one of the following:
+    a) `[python setup.py] make pypi`
+    b) `twine upload -s -i $(git config user.signingkey) dist/tqdm-*`
+10. create new release on https://github.com/tqdm/tqdm/releases
+    a) add helpful release notes
+    b) attach dist/tqdm-* binaries (usually only *.whl*)
+11. run `make` in the `wiki` submodule to update release notes
+12. run `make deploy` in the `docs` submodule to update website
+13. accept the automated PR in the `feedstock` submodule to update conda
+
+The last thee steps require a one-time `make submodules` to clone
+`docs`, `wiki`, and `feedstock`.
diff --git a/Makefile b/Makefile
@@ -116,6 +116,11 @@ toxclean:
 installdev:
 	python setup.py develop --uninstall
 	python setup.py develop
+submodules:
+	git clone git@github.com:tqdm/tqdm.wiki wiki
+	git clone git@github.com:tqdm/tqdm.github.io docs
+	git clone git@github.com:conda-forge/tqdm-feedstock feedstock
+	cd feedstock && git remote add autotick-bot git@github.com:regro-cf-autotick-bot/tqdm-feedstock
 
 install:
 	python setup.py install

diff --git a/README.rst b/README.rst
@@ -829,7 +829,7 @@ Authors
 -------
 
 The main developers, ranked by surviving lines of code
-(`git fame -wMC <https://github.com/casperdcl/gitfame>`__), are:
+(`git fame -wMC <https://github.com/casperdcl/git-fame>`__), are:
 
 - Casper da Costa-Luis (`casperdcl <https://github.com/casperdcl>`__, ~2/3, |Gift-Casper|)
 - Stephen Larroque (`lrq3000 <https://github.com/lrq3000>`__, ~1/5)

diff --git a/tox.ini b/tox.ini
@@ -39,7 +39,7 @@ commands =
     - coveralls
     codecov
 
-# no cython/numpy/pandas for py{py,py3,26,33,37}
+# no cython/numpy/pandas for py{py,py3,26,33,34}
 
 [testenv:py26]
 # no codecov and timer for py26
@@ -60,13 +60,6 @@ commands = {[extra]commands}
 
 [testenv:py34]
 # py34-compatible pandas
-deps =
-    {[extra]deps}
-    cython
-    numpy
-    pandas<0.21
-
-[testenv:py37]
 deps = {[extra]deps}
 commands = {[extra]commands}
 

diff --git a/tqdm/_tqdm.py b/tqdm/_tqdm.py
@@ -581,6 +581,10 @@ def inner(df, func, *args, **kwargs):
                             not isinstance(df, _Rolling_and_Expanding):
                         # DataFrame or Panel
                         axis = kwargs.get('axis', 0)
+                        if axis == 'index':
+                            axis = 0
+                        elif axis == 'columns':
+                            axis = 1
                         # when axis=0, total is shape[axis1]
                         total = df.size // df.shape[axis]
 
@@ -948,6 +952,7 @@ def __iter__(self):
                                 if avg_time is None \
                                 else smoothing * delta_t / delta_it + \
                                 (1 - smoothing) * avg_time
+                            self.avg_time = avg_time
 
                         self.n = n
                         with self._lock:

diff --git a/tqdm/_tqdm_notebook.py b/tqdm/_tqdm_notebook.py
@@ -102,7 +102,7 @@ def status_printer(_, total=None, desc=None, ncols=None):
         except NameError:
             # #187 #451 #558
             raise ImportError(
-                "IntProgress not found. Please update juputer and ipywidgets."
+                "IntProgress not found. Please update jupyter and ipywidgets."
                 " See https://ipywidgets.readthedocs.io/en/stable"
                 "/user_install.html")
 

diff --git a/tqdm/_version.py b/tqdm/_version.py
@@ -5,7 +5,7 @@
 __all__ = ["__version__"]
 
 # major, minor, patch, -extra
-version_info = 4, 25, 0
+version_info = 4, 26, 0
 
 # Nice string for the version
 __version__ = '.'.join(map(str, version_info))

diff --git a/tqdm/tests/tests_pandas.py b/tqdm/tests/tests_pandas.py
@@ -33,12 +33,12 @@ def test_pandas_rolling_expanding():
         tqdm.pandas(file=our_file, leave=True, ascii=True)
 
         series = pd.Series(randint(0, 50, (123,)))
-        res1 = series.rolling(10).progress_apply(lambda x: 1)
-        res2 = series.rolling(10).apply(lambda x: 1)
+        res1 = series.rolling(10).progress_apply(lambda x: 1, raw=True)
+        res2 = series.rolling(10).apply(lambda x: 1, raw=True)
         assert res1.equals(res2)
 
-        res3 = series.expanding(10).progress_apply(lambda x: 2)
-        res4 = series.expanding(10).apply(lambda x: 2)
+        res3 = series.expanding(10).progress_apply(lambda x: 2, raw=True)
+        res4 = series.expanding(10).apply(lambda x: 2, raw=True)
         assert res3.equals(res4)
 
         expects = ['114it']  # 123-10+1
@@ -104,7 +104,7 @@ def task_func(x):
         assert res1.equals(res2)
 
         # apply
-        for axis in [0, 1]:
+        for axis in [0, 1, 'index', 'columns']:
             res3 = df.progress_apply(task_func, axis=axis)
             res4 = df.apply(task_func, axis=axis)
             assert res3.equals(res4)