bump version, merge pull request #49 from iterative/fix-non-str-choices

.gitignore

@@ -1,13 +1,13 @@
 *.py[cod]
-/shtab/_dist_ver.py
+__pycache__/
 
 # Packages
+/shtab/_dist_ver.py
 /*.egg*/
 /build/
 /dist/
 
 # Unit test / coverage reports
-/.coverage
-/.pytest_cache/
+/.coverage*
 /coverage.xml
-__pycache__/
+/.pytest_cache/

.pre-commit-config.yaml

@@ -22,9 +22,9 @@ repos:
     name: Check TODO
     language: pygrep
     entry: TODO
+    args: [-i]
     types: [text]
     exclude: ^(.pre-commit-config.yaml|.github/workflows/test.yml)$
-    args: [-i]
 - repo: https://gitlab.com/pycqa/flake8
   rev: 3.9.2
   hooks:

setup.cfg

@@ -86,4 +86,7 @@ known_first_party=shtab
 
 [tool:pytest]
 timeout=5
-addopts=-v --tb=short -rxs -W=error --log-level=debug --durations=0 --cov=shtab --cov-report=term-missing --cov-report=xml
+log_level=DEBUG
+python_files=test_*.py
+testpaths=tests
+addopts=-v --tb=short -rxs -W=error --durations=0 --cov=shtab --cov-report=term-missing --cov-report=xml

shtab/__init__.py

@@ -553,7 +553,7 @@ def format_optional(opt):
                 else (
                     choice_type2fn[opt.choices[0].type]
                     if isinstance(opt.choices[0], Choice)
-                    else "({})".format(" ".join(opt.choices))
+                    else "({})".format(" ".join(map(str, opt.choices)))
                 )
                 if opt.choices
                 else "",
@@ -570,7 +570,7 @@ def format_positional(opt):
             else (
                 choice_type2fn[opt.choices[0].type]
                 if isinstance(opt.choices[0], Choice)
-                else "({})".format(" ".join(opt.choices))
+                else "({})".format(" ".join(map(str, opt.choices)))
             )
             if opt.choices
             else "",