fixes #273

Author: jph00

Makefile

@@ -27,7 +27,7 @@ release: pypi
 	nbdev_bump_version
 
 conda_release:
-	fastrelease_conda_package --upload_user fastai --build_args '-c pytorch -c fastai'
+	fastrelease_conda_package --mambabuild --upload_user fastai --build_args '-c pytorch -c fastai'
 
 pypi: dist
 	twine upload --repository pypi dist/*

fastcore/__init__.py

@@ -1 +1 @@
-__version__ = "1.3.16"
+__version__ = "1.3.17"

fastcore/_nbdev.py

@@ -69,6 +69,7 @@
          "Str": "01_basics.ipynb",
          "Float": "01_basics.ipynb",
          "concat": "01_basics.ipynb",
+         "strcat": "01_basics.ipynb",
          "detuplify": "01_basics.ipynb",
          "replicate": "01_basics.ipynb",
          "setify": "01_basics.ipynb",
@@ -101,6 +102,7 @@
          "arg3": "01_basics.ipynb",
          "arg4": "01_basics.ipynb",
          "bind": "01_basics.ipynb",
+         "mapt": "01_basics.ipynb",
          "map_ex": "01_basics.ipynb",
          "compose": "01_basics.ipynb",
          "maps": "01_basics.ipynb",

fastcore/basics.py

@@ -6,13 +6,13 @@
            'true', 'stop', 'gen', 'chunked', 'otherwise', 'custom_dir', 'AttrDict', 'type_hints', 'annotations',
            'anno_ret', 'argnames', 'with_cast', 'store_attr', 'attrdict', 'properties', 'camel2words', 'camel2snake',
            'snake2camel', 'class2attr', 'getattrs', 'hasattrs', 'setattrs', 'try_attrs', 'GetAttrBase', 'GetAttr',
-           'delegate_attr', 'ShowPrint', 'Int', 'Str', 'Float', 'concat', 'detuplify', 'replicate', 'setify', 'merge',
-           'range_of', 'groupby', 'last_index', 'filter_dict', 'filter_keys', 'filter_values', 'cycle', 'zip_cycle',
-           'sorted_ex', 'not_', 'argwhere', 'filter_ex', 'range_of', 'renumerate', 'first', 'nested_attr', 'nested_idx',
-           'val2idx', 'uniqueify', 'num_methods', 'rnum_methods', 'inum_methods', 'fastuple', 'arg0', 'arg1', 'arg2',
-           'arg3', 'arg4', 'bind', 'map_ex', 'compose', 'maps', 'partialler', 'instantiate', 'using_attr', 'Self',
-           'Self', 'copy_func', 'patch_to', 'patch', 'patch_property', 'ImportEnum', 'StrEnum', 'str_enum', 'Stateful',
-           'PrettyString', 'even_mults', 'num_cpus', 'add_props', 'typed']
+           'delegate_attr', 'ShowPrint', 'Int', 'Str', 'Float', 'concat', 'strcat', 'detuplify', 'replicate', 'setify',
+           'merge', 'range_of', 'groupby', 'last_index', 'filter_dict', 'filter_keys', 'filter_values', 'cycle',
+           'zip_cycle', 'sorted_ex', 'not_', 'argwhere', 'filter_ex', 'range_of', 'renumerate', 'first', 'nested_attr',
+           'nested_idx', 'val2idx', 'uniqueify', 'num_methods', 'rnum_methods', 'inum_methods', 'fastuple', 'arg0',
+           'arg1', 'arg2', 'arg3', 'arg4', 'bind', 'mapt', 'map_ex', 'compose', 'maps', 'partialler', 'instantiate',
+           'using_attr', 'Self', 'Self', 'copy_func', 'patch_to', 'patch', 'patch_property', 'ImportEnum', 'StrEnum',
+           'str_enum', 'Stateful', 'PrettyString', 'even_mults', 'num_cpus', 'add_props', 'typed']
 
 # Cell
 from .imports import *
@@ -424,6 +424,11 @@ def concat(colls)->list:
     "Concatenate all collections in `colls`"
     return list(itertools.chain.from_iterable(colls))
 
+# Cell
+def strcat(its, sep:str='')->str:
+    "Concatenate stringified items `its`"
+    return sep.join(map(str,its))
+
 # Cell
 def detuplify(x):
     "If `x` is a tuple with one thing, extract it"
@@ -645,6 +650,11 @@ def __call__(self, *args, **kwargs):
         fargs = [args[x.i] if isinstance(x, _Arg) else x for x in self.pargs] + args[self.maxi+1:]
         return self.func(*fargs, **kwargs)
 
+# Cell
+def mapt(func, *iterables):
+    "Tuplified `map`"
+    return tuple(map(func, *iterables))
+
 # Cell
 def map_ex(iterable, f, *args, gen=False, **kwargs):
     "Like `map`, but use `bind`, and supports `str` and indexing"

fastcore/xtras.py

@@ -168,9 +168,10 @@ def run(cmd, *rest, ignore_ex=False, as_bytes=False):
     elif isinstance(cmd,str): cmd = shlex.split(cmd)
     res = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout = res.stdout
-    if not as_bytes: stdout = stdout.decode()
+    if res.stderr: stdout += b' ;; ' + res.stderr
+    if not as_bytes: stdout = stdout.decode().strip()
     if ignore_ex: return (res.returncode, stdout)
-    if res.returncode: raise IOError("{} ;; {}".format(res.stdout, res.stderr))
+    if res.returncode: raise IOError(stdout)
     return stdout
 
 # Cell

nbs/01_basics.ipynb

@@ -2732,6 +2732,28 @@
     "concat([(o for o in range(2)),[2,3,4]])"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#export\n",
+    "def strcat(its, sep:str='')->str:\n",
+    "    \"Concatenate stringified items `its`\"\n",
+    "    return sep.join(map(str,its))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "test_eq(strcat(['a',2]), 'a2')\n",
+    "test_eq(strcat(['a',2], ';'), 'a;2')"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -3781,6 +3803,28 @@
     "test_eq(bind(myfn, 17,19,14,e=arg0)(3), (17,19,14,1,3))"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#export\n",
+    "def mapt(func, *iterables):\n",
+    "    \"Tuplified `map`\"\n",
+    "    return tuple(map(func, *iterables))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "t = [0,1,2,3]\n",
+    "test_eq(mapt(operator.neg, t), (0,-1,-2,-3))"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -3804,7 +3848,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "t = [0,1,2,3]\n",
     "test_eq(map_ex(t,operator.neg), [0,-1,-2,-3])"
    ]
   },

nbs/03_xtras.ipynb

@@ -618,7 +618,7 @@
     {
      "data": {
       "text/plain": [
-       "['a', 'b', 'd', 'c', 'h', 'e', 'f', 'g']"
+       "['g', 'a', 'b', 'd', 'f', 'e', 'c', 'h']"
       ]
      },
      "execution_count": null,
@@ -1050,9 +1050,10 @@
     "    elif isinstance(cmd,str): cmd = shlex.split(cmd)\n",
     "    res = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n",
     "    stdout = res.stdout\n",
-    "    if not as_bytes: stdout = stdout.decode()\n",
+    "    if res.stderr: stdout += b' ;; ' + res.stderr\n",
+    "    if not as_bytes: stdout = stdout.decode().strip()\n",
     "    if ignore_ex: return (res.returncode, stdout)\n",
-    "    if res.returncode: raise IOError(\"{} ;; {}\".format(res.stdout, res.stderr))\n",
+    "    if res.returncode: raise IOError(stdout)\n",
     "    return stdout"
    ]
   },

settings.ini

@@ -7,7 +7,7 @@ author = Jeremy Howard and Sylvain Gugger
 author_email = [email protected]
 copyright = fast.ai
 branch = master
-version = 1.3.16
+version = 1.3.17
 min_python = 3.6
 audience = Developers
 language = English