Merge branch 'origin' into feature-independent

.github/workflows/ci.yaml

@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  - push
+  - pull_request
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+
+  tox:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+        python-version:
+          - "3.6"
+          - "3.7"
+          - "3.8"
+          - "pypy-3.7"
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Check git is working
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Testing Git on Travis CI"
+          git --version
+          git config --list
+      - name: Check mercurial is working
+        run: |
+          echo -e '[ui]\nusername = Testing Mercurial on Travis CI <[email protected]>' > ~/.hgrc
+          hg --version
+      - name: Install test dependencies
+        run: pip install tox tox-gh-actions
+      - name: Run setup and tests as defined in tox.ini
+        run: tox

CHANGELOG.md

@@ -1,5 +1,6 @@
 **unreleased**
 **v1.0.2-dev**
+- Housekeeping: migrated from travis+appveyor to GitHub Actions for CI, thanks @clbarnes
 
 **v1.0.1**
 - Added: enable special characters in search/replace, thanks @mckelvin
@@ -12,7 +13,7 @@
 
 **v1.0.0**
 - Fix the spurious newline that bump2version adds when writing to bumpversion.cfg, thanks @kyluca #58
-- Add Python3.8 support, thanks @florisla 
+- Add Python3.8 support, thanks @florisla
 - Drop Python2 support, thanks @hugovk
 - Allow additional arguments to the commit call, thanks @lubomir
 - Various documentation improvements, thanks @lubomir @florisla @padamstx @glotis
@@ -23,7 +24,7 @@
 - Housekeeping, also publish an sdist
 - Housekeeping, fix appveyor builds
 - Housekeeping, `make lint` now lints with pylint
-- Drop support for Python3.4, thanks @hugovk #79 
+- Drop support for Python3.4, thanks @hugovk #79
 - Enhance missing VCS command detection (errno 13), thanks @lowell80 #75
 - Add environment variables for other scripts to use, thanks @mauvilsa #70
 - Refactor, cli.main is now much more readable, thanks @florisla #68

README.md

@@ -3,8 +3,7 @@
 [![image](https://img.shields.io/pypi/v/bump2version.svg)](https://pypi.org/project/bump2version/)
 [![image](https://img.shields.io/pypi/l/bump2version.svg)](https://pypi.org/project/bump2version/)
 [![image](https://img.shields.io/pypi/pyversions/bump2version.svg)](https://pypi.org/project/bump2version/)
-[![Travis](https://img.shields.io/travis/c4urself/bump2version/master.svg?logo=travis)](https://travis-ci.org/c4urself/bump2version)
-[![AppVeyor](https://img.shields.io/appveyor/ci/c4urself/bump2version.svg?logo=appveyor)](https://ci.appveyor.com/project/c4urself/bump2version)
+[![GitHub Actions](https://github.com/c4urself/bump2version/workflows/CI/badge.svg)](https://github.com/c4urself/bump2version/actions)
 
 ## NOTE
 

tests/test_cli.py

@@ -117,7 +117,7 @@ def _mock_calls_to_string(called_mock):
 [--tag-message TAG_MESSAGE]
 [--message COMMIT_MSG]
 part
-[file [file ...]]
+[file ...]
 """.strip().splitlines()
 
 EXPECTED_USAGE = (r"""
@@ -247,7 +247,7 @@ def test_defaults_in_usage_with_config(tmpdir, capsys):
     assert "New version that should be in the files (default: 19)" in out
     assert "[--current-version VERSION]" in out
     assert "[--new-version VERSION]" in out
-    assert "[file [file ...]]" in out
+    assert "[file ...]" in out
 
 
 def test_missing_explicit_config_file(tmpdir):

tox.ini

@@ -13,3 +13,11 @@ commands=
 minversion= 2.0
 norecursedirs= .git .hg .tox build dist tmp*
 python_files = test*.py
+
+[gh-actions]
+python =
+    2.7: py27
+    3.6: py36
+    3.7: py37
+    3.8: py38, mypy
+    pypy-3.7: pypy3