Skip to content

Commit

Permalink
Merge pull request #97 from citation-file-format/prep-1.2.0
Browse files Browse the repository at this point in the history
prep release 1.2.0
  • Loading branch information
jspaaks authored Jun 25, 2019
2 parents 9b9452d + cb62d90 commit e439deb
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
1.2.0
=====

- corrected an error where cffconvert could not raise an error during validation (https://github.com/citation-file-format/cff-converter-python/issues/94).

1.1.0
=====

Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ authors:
given-names: Stephan
orcid: https://orcid.org/0000-0003-4925-7248
cff-version: "1.0.3"
date-released: 2019-04-04
date-released: 2019-06-25
doi: 10.5281/zenodo.1162057
keywords:
- "citation"
Expand All @@ -32,4 +32,4 @@ license: Apache-2.0
message: "If you use this software, please cite it using these metadata."
repository-code: "https://github.com/citation-file-format/cff-converter-python"
title: cffconvert
version: "1.1.0"
version: "1.2.0"
2 changes: 1 addition & 1 deletion cffconvert/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://stackoverflow.com/questions/2058802/how-can-i-get-the-version-defined
# -in-setup-py-setuptools-in-my-package#answer-24517154

__version__ = "1.1.0"
__version__ = "1.2.0"
2 changes: 1 addition & 1 deletion test/cli_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def test_printing_of_help(self):
def test_printing_of_version(self):
result = self.runner.invoke(cffconvert_cli, ["--version"])
self.assertTrue(result.exit_code == 0)
self.assertEqual(result.output, "1.1.0\n")
self.assertEqual(result.output, "1.2.0\n")

def test_printing_when_verbose(self):
result = self.runner.invoke(cffconvert_cli, ["--verbose"])
Expand Down

0 comments on commit e439deb

Please sign in to comment.