bump version, merge pull request #31 from iterative/devel

Author: casperdcl

.github/workflows/test.yml

@@ -18,9 +18,7 @@ jobs:
       with:
         path: ~/.cache/pre-commit
         key: pre-commit|${{ env.PYSHA }}|${{ hashFiles('.pre-commit-config.yaml') }}
-    - run: pip install -U -r requirements-dev.txt
-    - run: python setup.py sdist bdist_wheel
-    - run: twine check dist/*
+    - run: pip install -U pre-commit
     - uses: reviewdog/action-setup@v1
     - run: |
         pre-commit run -a flake8 | reviewdog -f=pep8 -name=flake8 -tee -reporter=github-check -filter-mode nofilter
@@ -42,28 +40,27 @@ jobs:
       with:
         python-version: ${{ matrix.python }}
     - run: pip install -U -r requirements-dev.txt
-    - run: python -m tests --cov-report=term-missing
+    - run: pytest
     - uses: codecov/codecov-action@v1
   deploy:
-    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
     name: PyPI Deploy
     needs: [check, test]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - uses: casperdcl/deploy-pypi@v1
+    - uses: actions/setup-python@v2
+    - id: dist
+      uses: casperdcl/deploy-pypi@v2
       with:
-        password: ${{ secrets.PYPI_TOKEN }}
         build: true
-    - id: collect_assets
-      name: Collect assets
-      run: |
-        echo "::set-output name=asset_path::$(ls dist/*.whl)"
-        echo "::set-output name=asset_name::$(basename dist/*.whl)"
-        git log --pretty='format:%d%n- %s%n%b---' $(git tag --sort=v:refname | tail -n2 | head -n1)..HEAD > _CHANGES.md
-    - id: create_release
+        password: ${{ secrets.PYPI_TOKEN }}
+        upload: ${{ github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') }}
+    - name: Changelog
+      run: git log --pretty='format:%d%n- %s%n%b---' $(git tag --sort=v:refname | tail -n2 | head -n1)..HEAD > _CHANGES.md
+    - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+      id: create_release
       uses: actions/create-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -72,11 +69,12 @@ jobs:
         release_name: shtab ${{ github.ref }} beta
         body_path: _CHANGES.md
         draft: true
-    - uses: actions/upload-release-asset@v1
+    - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+      uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ${{ steps.collect_assets.outputs.asset_path }}
-        asset_name: ${{ steps.collect_assets.outputs.asset_name }}
+        asset_path: dist/${{ steps.dist.outputs.whl }}
+        asset_name: ${{ steps.dist.outputs.whl }}
         asset_content_type: application/zip

.pre-commit-config.yaml

@@ -2,31 +2,43 @@ default_language_version:
   python: python3
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.4.0
+  rev: v3.4.0
   hooks:
   - id: check-added-large-files
   - id: check-case-conflict
   - id: check-docstring-first
   - id: check-executables-have-shebangs
   - id: check-toml
+  - id: check-merge-conflict
   - id: check-yaml
+  - id: debug-statements
   - id: end-of-file-fixer
   - id: mixed-line-ending
+  - id: sort-simple-yaml
   - id: trailing-whitespace
-- hooks:
+- repo: local
+  hooks:
+  - id: todo
+    name: Check TODO
+    language: pygrep
+    entry: TODO
+    types: [text]
+    exclude: ^(.pre-commit-config.yaml|.github/workflows/test.yml)$
+    args: [-i]
+- repo: https://gitlab.com/pycqa/flake8
+  rev: 3.8.4
+  hooks:
   - id: flake8
     additional_dependencies:
     - flake8-bugbear
     - flake8-comprehensions
     - flake8-debugger
     - flake8-string-format
-  repo: https://gitlab.com/pycqa/flake8
-  rev: 3.8.4
-- hooks:
-  - id: black
-  repo: https://github.com/psf/black
+- repo: https://github.com/psf/black
   rev: 19.10b0
-- hooks:
+  hooks:
+  - id: black
+- repo: https://github.com/PyCQA/isort
+  rev: 5.7.0
+  hooks:
   - id: isort
-  repo: https://github.com/timothycrosley/isort
-  rev: 5.6.4

CONTRIBUTING.md

@@ -5,9 +5,10 @@
 When contributing pull requests, it's a good idea to run basic checks locally:
 
 ```bash
-shtab (master)$ pip install .[dev]  # install development dependencies
+# install development dependencies
+shtab (master)$ pip install pre-commit -r requirements-dev.txt
 shtab (master)$ pre-commit install  # install pre-commit checks
-shtab (master)$ python -m tests     # run all tests
+shtab (master)$ pytest              # run all tests
 ```
 
 ## Layout

pyproject.toml

@@ -7,4 +7,4 @@ write_to = "shtab/_dist_ver.py"
 write_to_template = "__version__ = '{version}'\n"
 
 [tool.black]
-target-version = ['py27', 'py36']
+target_version = ["py27", "py36", "py38"]

requirements-dev.txt

@@ -1,5 +1,3 @@
-pre-commit
-twine
-wheel
 pytest
 pytest-cov
+pytest-timeout

setup.cfg

@@ -70,6 +70,8 @@ packages=find:
 [options.entry_points]
 console_scripts=
     shtab=shtab.main:main
+[options.packages.find]
+exclude=tests
 [bdist_wheel]
 universal=1
 
@@ -81,3 +83,7 @@ exclude=build,dist,.eggs,.git,__pycache__
 [isort]
 profile=black
 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

tests/__main__.py

@@ -1,8 +1,5 @@
 """
 Tests for `shtab`.
-
-Currently runnable via nosetests, e.g.:
-    shtab$ nose tests -d -v
 """
 import logging
 import subprocess