diff --git a/doc/source/whatsnew/v1.0.1.rst b/doc/source/whatsnew/v1.0.1.rst index 222690b2aed8d..bf9fa5f9d0708 100644 --- a/doc/source/whatsnew/v1.0.1.rst +++ b/doc/source/whatsnew/v1.0.1.rst @@ -1,7 +1,7 @@ .. _whatsnew_101: -What's new in 1.0.1 (??) ------------------------- +What's new in 1.0.1 (February 5, 2020) +-------------------------------------- These are the changes in pandas 1.0.1. See :ref:`release` for a full changelog including other versions of pandas. @@ -74,3 +74,5 @@ Bug fixes Contributors ~~~~~~~~~~~~ + +.. contributors:: v0.25.3..v1.0.1|HEAD diff --git a/doc/sphinxext/announce.py b/doc/sphinxext/announce.py index f394aac5c545b..e4859157f73de 100755 --- a/doc/sphinxext/announce.py +++ b/doc/sphinxext/announce.py @@ -57,6 +57,16 @@ def get_authors(revision_range): pat = "^.*\\t(.*)$" lst_release, cur_release = [r.strip() for r in revision_range.split("..")] + if "|" in cur_release: + # e.g. v1.0.1|HEAD + maybe_tag, head = cur_release.split("|") + assert head == "HEAD" + if maybe_tag in this_repo.tags: + cur_release = maybe_tag + else: + cur_release = head + revision_range = f"{lst_release}..{cur_release}" + # authors, in current release and previous to current release. cur = set(re.findall(pat, this_repo.git.shortlog("-s", revision_range), re.M)) pre = set(re.findall(pat, this_repo.git.shortlog("-s", lst_release), re.M)) diff --git a/doc/sphinxext/contributors.py b/doc/sphinxext/contributors.py index d9ba2bb2cfb07..c2b21e40cadad 100644 --- a/doc/sphinxext/contributors.py +++ b/doc/sphinxext/contributors.py @@ -6,7 +6,13 @@ This will be replaced with a message indicating the number of code contributors and commits, and then list each contributor -individually. +individually. For development versions (before a tag is available) +use:: + + .. contributors:: v0.23.0..v0.23.1|HEAD + +While the v0.23.1 tag does not exist, that will use the HEAD of the +branch as the end of the revision range. """ from announce import build_components from docutils import nodes