Skip to content

Commit

Permalink
Merge pull request #93 from citation-file-format/prep-1.1.0
Browse files Browse the repository at this point in the history
Prep 1.1.0
  • Loading branch information
jspaaks authored Apr 4, 2019
2 parents 92a06a1 + 09b851a commit e78aea8
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 72 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
1.1.0
=====

- replaced pykwalifire with its parent pykwalify
- now works for python 3.7 (refs #80)
- not using PyYAML anymore (but it still comes along with pykwalify for some reason)
- added a function that can be used as Google Cloud function
- hopefully fixed parsing of strings that should have been entered as dates (the new validator does
not find that offensive, hence I had to fix it myself)

1.0.4
=====

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: 2018-12-05
date-released: 2019-04-04
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.0.4"
version: "1.1.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.0.4"
__version__ = "1.1.0"
60 changes: 0 additions & 60 deletions codemeta.json

This file was deleted.

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.0.4\n")
self.assertEqual(result.output, "1.1.0\n")

def test_printing_when_verbose(self):
result = self.runner.invoke(cffconvert_cli, ["--verbose"])
Expand Down
8 changes: 0 additions & 8 deletions test/consistency_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ def setUp(self):
# this uses the version information provided by the user through setup.py
self.expected_version = expected_version

def test_version_number_codemeta(self):
# codemeta content should have the same semver as setup.py / version.py
fixture = os.path.join("codemeta.json")
with open(fixture, "r") as f:
codemeta_contents = f.read()
actual_version = json.loads(codemeta_contents)["version"]
self.assertEqual(self.expected_version, actual_version)

def test_version_number_cff(self):
# CITATION.cff content should have the same semver as setup.py / version.py
fixture = os.path.join("CITATION.cff")
Expand Down

0 comments on commit e78aea8

Please sign in to comment.