Skip to content

Commit

Permalink
Merge pull request #99 from citation-file-format/deps
Browse files Browse the repository at this point in the history
Deps
  • Loading branch information
jspaaks authored Jul 16, 2019
2 parents c7c3f71 + afd9c64 commit 03fd5c1
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ notifications:
on_failure: change
on_succes: never
python:
- "3.4"
- "3.5"
- "3.6"
- "3.7"
- "nightly"
install:
- pip install -r requirements.txt
- pip install -r requirements-dev.txt
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
1.2.1
=====

- setup.py no longer includes test dependencies as install dependencies

1.2.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-06-25
date-released: 2019-07-16
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.2.0"
version: "1.2.1"
7 changes: 7 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ To learn more about the other options, check
https://us-central1-cffconvert.cloudfunctions.net/cffconvert?verbose


**Option 5 (not preferred): install with setup.py in the user environment**

.. code:: bash
python setup.py install --user
Command line interface
----------------------

Expand Down
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.2.0"
__version__ = "1.2.1"
6 changes: 3 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pytest==3.3.2
pytest-cov==2.5.1
pytest-runner==4.2
pytest
pytest-cov
pytest-runner
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
click==6.7
requests==2.20.0
pykwalify[ruamel]==1.7.0
ruamel.yaml==0.15.89
click==6.*
requests==2.*
pykwalify[ruamel]==1.*
ruamel.yaml==0.*
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ def get_version():
'Topic :: Utilities'
],
packages=find_packages(),
install_requires=get_install_dependencies() + get_test_dependencies(),
install_requires=get_install_dependencies(),
setup_requires=get_test_dependencies(),
tests_require=get_test_dependencies(),
long_description=get_readme()
)
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.2.0\n")
self.assertEqual(result.output, "1.2.1\n")

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

0 comments on commit 03fd5c1

Please sign in to comment.