Merge pull request pytest-dev#248 from nicoddemus/changelog-rst

Rename CHANGELOG to CHANGELOG.rst
bluetech · Jun 25, 2020 · 2da2cae · 2da2cae
2 parents 790e009 + 88a96b4
commit 2da2cae
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG → CHANGELOG.rst b/CHANGELOG → CHANGELOG.rst
diff --git a/HOWTORELEASE.rst b/HOWTORELEASE.rst
@@ -3,7 +3,7 @@ Release Procedure
 
 #. Create a branch ``release-X.Y.Z`` from the latest ``master``.
 
-#. Manually update the ``CHANGELOG`` and commit.
+#. Manually update the ``CHANGELOG.rst`` and commit.
 
 #. Open a PR for this branch targeting ``master``.
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include CHANGELOG
+include CHANGELOG.rst
 include AUTHORS
 include README.rst
 include setup.py

diff --git a/doc/changelog.txt b/doc/changelog.txt
@@ -1,3 +1,3 @@
 .. _`changelog`:
 
-.. include:: ../CHANGELOG
+.. include:: ../CHANGELOG.rst