bump version, merge pull request #8 from AMYPAD/devel

AMYPAD · Nov 24, 2020 · 5654e31 · 5654e31
2 parents 99aa390 + e64d4e9
commit 5654e31
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,9 +21,7 @@ jobs:
     - run: flake8 .
     - if: |
         ! startsWith(matrix.python, '2')
-      run: |
-        pip install -U black
-        black --check .
+      run: black --check .
   test:
     runs-on: ubuntu-latest
     strategy:
@@ -77,15 +75,15 @@ jobs:
     - id: create_release
       uses: actions/create-release@v1
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
       with:
         tag_name: ${{ github.ref }}
         release_name: miutil ${{ github.ref }} beta
         body_path: _CHANGES.md
         draft: true
     - uses: actions/upload-release-asset@v1
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: ${{ steps.collect_assets.outputs.asset_path }}
@@ -94,7 +92,7 @@ jobs:
     - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
       uses: actions/upload-release-asset@v1
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: ${{ steps.collect_assets.outputs.asset_path_sig }}

diff --git a/miutil/imio/nii.py b/miutil/imio/nii.py
@@ -26,12 +26,11 @@ def file_parts(fname, regex=RE_NII_GZ):
 def nii_ugzip(imfile, outpath=""):
     """Uncompress *.gz file"""
     assert hasext(imfile, "gz")
-    fout, ext = file_parts(imfile, RE_GZ)
+    dout, fout, ext = file_parts(imfile, RE_GZ)
     with gzip.open(imfile, "rb") as f:
         s = f.read()
     # write the uncompressed data
-    if outpath:
-        fout = os.path.join(outpath, os.path.basename(fout))
+    fout = os.path.join(outpath or dout, fout)
     with open(fout, "wb") as f:
         f.write(s)
     return fout

diff --git a/setup.cfg b/setup.cfg
@@ -41,6 +41,7 @@ classifiers =
     Topic :: System :: Installation/Setup
     Topic :: Utilities
 [options]
+zip_safe = False
 setup_requires = setuptools>=42; setuptools_scm[toml]>=3.4
 install_requires =
     argparse; python_version == "2.6"