diff --git a/autorelease-local.yml b/autorelease-local.yml index 118b85d..5d2fa4e 100644 --- a/autorelease-local.yml +++ b/autorelease-local.yml @@ -1,5 +1,12 @@ +stages: + - test + - deploy testpypi + - test testpypi + - cut release + - deploy pypi + import: - travis_stages/deploy_testpypi.yml + - travis_stages/test_testpypi.yml - travis_stages/cut_release.yml - travis_stages/deploy_pypi.yml - - travis_stages/test_testpypi.yml diff --git a/autorelease-travis.yml b/autorelease-travis.yml index f429882..c7fd318 100644 --- a/autorelease-travis.yml +++ b/autorelease-travis.yml @@ -1,8 +1,16 @@ -# AUTORELEASE v0.2.0 +# AUTORELEASE v0.2.1 # for nonrelease, use @master # for release, use v${VERSION}, e.g., v1.0.0 +stages: + - test + - deploy testpypi + - test testpypi + - cut release + - deploy pypi + import: - - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@v0.2.0 - - dwhswenson/autorelease:travis_stages/cut_release.yml@v0.2.0 - - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@v0.2.0 - - dwhswenson/autorelease:travis_stages/test_testpypi.yml@v0.2.0 + - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@v0.2.1 + - dwhswenson/autorelease:travis_stages/test_testpypi.yml@v0.2.1 + - dwhswenson/autorelease:travis_stages/cut_release.yml@v0.2.1 + - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@v0.2.1 + diff --git a/autorelease/release_notes.py b/autorelease/release_notes.py index ae33a5d..8154ed2 100644 --- a/autorelease/release_notes.py +++ b/autorelease/release_notes.py @@ -117,10 +117,12 @@ def write_pull_line(self, pull, extra_labels=None): title = pull['title'] number = str(pull['number']) author = pull['user']['login'] - out_str = "* " + title + " (#" + number + ")" + out_str = "* " + title + " (#" + number if author not in self.config['standard_contributors']: out_str += " @" + author + out_str += ")" for label in extra_labels: + label = label.replace(' ', '_') out_str += " #" + label out_str += "\n" return out_str diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml index 36185c0..0a7918c 100644 --- a/devtools/conda-recipe/meta.yaml +++ b/devtools/conda-recipe/meta.yaml @@ -1,7 +1,7 @@ package: name: autorelease # add ".dev0" for unreleased versions - version: "0.2.0" + version: "0.2.1" source: path: ../../ diff --git a/docs/conf.py b/docs/conf.py index bde0f61..987bc76 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -86,7 +86,7 @@ # General information about the project. project = u'autorelease' -copyright = u'2017, David W.H. Swenson' +copyright = u'2017-2020, David W.H. Swenson' author = u'David W.H. Swenson' # The language for content autogenerated by Sphinx. Refer to documentation diff --git a/setup.cfg b/setup.cfg index f316443..b87e968 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = autorelease -version = 0.2.0 +version = 0.2.1 # version should end in .dev0 if this isn't to be released short_description = Tools to keep the release process clean. description = Tools to keep the release process clean.