Skip to content

Commit

Permalink
Merge branch 'hotfix/0.5.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
RKrahl committed Feb 14, 2020
2 parents 3f8b847 + e56c4e3 commit 7ba3afb
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Copyright and License

- Copyright 2013-2015
Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
- Copyright 2016-2018 Rolf Krahl
- Copyright 2016-2020 Rolf Krahl

Licensed under the Apache License, Version 2.0 (the "License"); you
may not use this file except in compliance with the License. You may
Expand Down
5 changes: 5 additions & 0 deletions doc/src/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
History of changes to pytest-dependency
=======================================

0.5.1 (2020-02-14)

Bug fixes and minor changes
+ Fix failing documentation build.

0.5.0 (2020-02-14)
New features
+ `#3`_, `#35`_: add a scope to dependencies.
Expand Down
2 changes: 1 addition & 1 deletion doc/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

# General information about the project.
project = u'pytest-dependency'
copyright = u'2016-2018, Rolf Krahl'
copyright = u'2016-2020, Rolf Krahl'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
pytest >=3.6.0
setuptools_scm

0 comments on commit 7ba3afb

Please sign in to comment.