Merge branch 'jef/github-actions' of https://github.com/jef/beets into jef/github-actions

.github/workflows/ci.yaml

@@ -11,7 +11,7 @@ jobs:
       NOSE_SHOW_SKIPPED: 1
     steps:
       - uses: actions/checkout@v2
-      - name: Set up python 2.7
+      - name: Set up Python 2.7
         uses: actions/setup-python@v2
         with:
           python-version: 2.7
@@ -46,7 +46,7 @@ jobs:
       NOSE_SHOW_SKIPPED: 1
     steps:
       - uses: actions/checkout@v2
-      - name: Set up python 3.${{ matrix.python-version }}
+      - name: Set up Python 3.${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: 3.${{ matrix.python-version }}
@@ -81,7 +81,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python to build docs with sphinx
+      - name: Set up Python to build docs with Sphinx
         uses: actions/setup-python@v2
         with:
           python-version: 2.7
@@ -90,4 +90,4 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install tox sphinx
       - name: Build and check docs using tox
-        run: tox -e docs
+        run: tox -e docs

beets/importer.py

@@ -1034,8 +1034,8 @@ class ArchiveImportTask(SentinelImportTask):
             cls._handlers = []
             from zipfile import is_zipfile, ZipFile
             cls._handlers.append((is_zipfile, ZipFile))
-            from tarfile import is_tarfile, TarFile
-            cls._handlers.append((is_tarfile, TarFile))
+            import tarfile
+            cls._handlers.append((tarfile.is_tarfile, tarfile.open))
             try:
                 from rarfile import is_rarfile, RarFile
             except ImportError:

docs/changelog.rst

@@ -124,6 +124,8 @@ New features:
   separators to support path queries.
   Thanks to :user:`nmeum`.
   :bug:`3567`
+* ``beet import`` now handles tar archives with bzip2 or gzip compression.
+  :bug:`3606`
 
 Fixes:
 

docs/reference/cli.rst

@@ -212,7 +212,7 @@ The ``-p`` option makes beets print out filenames of matched items, which might
 be useful for piping into other Unix commands (such as `xargs`_). Similarly, the
 ``-f`` option lets you specify a specific format with which to print every album
 or track. This uses the same template syntax as beets' :doc:`path formats
-<pathformat>`. For example, the command ``beet ls -af '$album: $tracktotal'
+<pathformat>`. For example, the command ``beet ls -af '$album: $albumtotal'
 beatles`` prints out the number of tracks on each Beatles album. In Unix shells,
 remember to enclose the template argument in single quotes to avoid environment
 variable expansion.

tox.ini

@@ -56,4 +56,4 @@ commands =
 [testenv:docs]
 basepython = python2.7
 deps = sphinx
-commands = sphinx-build -W -q -b html docs {envtmpdir}/html {posargs}
+commands = sphinx-build -W -q -b html docs {envtmpdir}/html {posargs}