Skip to content

Commit

Permalink
Merge branch 'release/3.1.2' into new-master
Browse files Browse the repository at this point in the history
  • Loading branch information
Sean Hudgston committed Oct 22, 2019
2 parents 982beab + 58be15b commit b905269
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cirrus.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = cirrus-cli
version = 3.1.1
version = 3.1.2
description = cirrus development and build git extensions
organization = cloudant
version_file = src/cirrus/__init__.py
Expand Down
2 changes: 1 addition & 1 deletion src/cirrus/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
See the License for the specific language governing permissions and
limitations under the License.
"""
__version__="3.1.1"
__version__="3.1.2"

2 changes: 1 addition & 1 deletion src/cirrus/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def main():
opts = build_parser(sys.argv[1:])
config = load_configuration()
testrunners = {
'nosetest': nose_run,
'nosetests': nose_run,
'pytest': pytest_run,
'tox': tox_run
}
Expand Down

0 comments on commit b905269

Please sign in to comment.