Combine and reformat changelog

changelog.rst has complete changelog. Include 1.0 and later changes in the package description.
jazzband · Jul 1, 2015 · b750630 · b750630
1 parent d90002b
commit b750630
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 88 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,7 +2,7 @@ include .coveragerc
 include LICENSE
 include Makefile
 include README.rst
-include changelog.txt
+include changelog.rst
 include manage.py
 include requirements.txt
 include runtests.sh

diff --git a/README.rst b/README.rst
@@ -327,61 +327,3 @@ Django 1.0
 ~~~~~~~~~~
 
 django-nose does not support Django 1.0.
-
-
-Recent Version History
-----------------------
-1.4.1 (2015-06-29)
- * Fix version number (ezarowny)
- * Fix choice options, unbreaking nose-cover (aamirtharaj-rpx, jwhitlock)
- * Support 1.8 app loading system (dgladkov)
- * Support non-ASCII file names (singingwolfboy)
- * Better PEP8'd assertion names (roganov)
-
-1.4 (2015-04-23)
-  * Django 1.8 support (timc3, adepue, jwhitlock)
-  * Support --testrunner option (st3lk)
-  * Fix REUSE_DB second run in py3k (edrmp)
-
-1.3 (2014-12-05)
-  * Django 1.6 and 1.7 support (conrado, co3k, Nepherhotep, mbertheau)
-  * Python 3.3 and 3.4 testing and support (frewsxcv, jsocol)
-
-1.2 (2013-07-23)
-  * Python 3 support (melinath and jonashaag)
-  * Django 1.5 compat (fabiosantoscode)
-
-1.1 (2012-05-19)
-  * Django TransactionTestCases don't clean up after themselves; they leave
-    junk in the DB and clean it up only on ``_pre_setup``. Thus, Django makes
-    sure these tests run last. Now django-nose does, too. This means one fewer
-    source of failures on existing projects. (Erik Rose)
-  * Add support for hygienic TransactionTestCases. (Erik Rose)
-  * Support models that are used only for tests. Just put them in any file
-    imported in the course of loading tests. No more crazy hacks necessary.
-    (Erik Rose)
-  * Make the fixture bundler more conservative, fixing some conceivable
-    situations in which fixtures would not appear as intended if a
-    TransactionTestCase found its way into the middle of a bundle. (Erik Rose)
-  * Fix an error that would surface when using SQLAlchemy with connection
-    pooling. (Roger Hu)
-  * Gracefully ignore the new ``--liveserver`` option introduced in Django 1.4;
-    don't let it through to nose. (Adam DePue)
-
-1.0 (2012-03-12)
-  * New fixture-bundling plugin for avoiding needless fixture setup (Erik Rose)
-  * Moved FastFixtureTestCase in from test-utils, so now all the
-    fixture-bundling stuff is in one library. (Erik Rose)
-  * Added the REUSE_DB setting for faster startup and shutdown. (Erik Rose)
-  * Fixed a crash when printing options with certain verbosities. (Daniel Abel)
-  * Broke hard dependency on MySQL. Support PostgreSQL. (Roger Hu)
-  * Support SQLite, both memory- and disk-based. (Roger Hu and Erik Rose)
-  * Nail down versions of the package requirements. (Daniel Mizyrycki)
-
-0.1.3 (2010-04-15)
-  * Even better coverage support (rozza)
-  * README fixes (carljm and ionelmc)
-  * optparse OptionGroups are handled better (outofculture)
-  * nose plugins are loaded before listing options
-
-See more in changelog.txt.
diff --git a/changelog.rst b/changelog.rst
@@ -0,0 +1,94 @@
+Changelog
+---------
+
+1.4.1 (2015-06-29)
+~~~~~~~~~~~~~~~~~~
+* Fix version number (ezarowny)
+* Fix choice options, unbreaking nose-cover (aamirtharaj-rpx, jwhitlock)
+* Support 1.8 app loading system (dgladkov)
+* Support non-ASCII file names (singingwolfboy)
+* Better PEP8'd assertion names (roganov)
+
+1.4 (2015-04-23)
+~~~~~~~~~~~~~~~~
+* Django 1.8 support (timc3, adepue, jwhitlock)
+* Support --testrunner option (st3lk)
+* Fix REUSE_DB second run in py3k (edrmp)
+
+1.3 (2014-12-05)
+~~~~~~~~~~~~~~~~
+* Django 1.6 and 1.7 support (conrado, co3k, Nepherhotep, mbertheau)
+* Python 3.3 and 3.4 testing and support (frewsxcv, jsocol)
+
+1.2 (2013-07-23)
+~~~~~~~~~~~~~~~~
+* Python 3 support (melinath and jonashaag)
+* Django 1.5 compat (fabiosantoscode)
+
+1.1 (2012-05-19)
+~~~~~~~~~~~~~~~~
+* Django TransactionTestCases don't clean up after themselves; they leave
+  junk in the DB and clean it up only on ``_pre_setup``. Thus, Django makes
+  sure these tests run last. Now django-nose does, too. This means one fewer
+  source of failures on existing projects. (Erik Rose)
+* Add support for hygienic TransactionTestCases. (Erik Rose)
+* Support models that are used only for tests. Just put them in any file
+  imported in the course of loading tests. No more crazy hacks necessary.
+  (Erik Rose)
+* Make the fixture bundler more conservative, fixing some conceivable
+  situations in which fixtures would not appear as intended if a
+  TransactionTestCase found its way into the middle of a bundle. (Erik Rose)
+* Fix an error that would surface when using SQLAlchemy with connection
+  pooling. (Roger Hu)
+* Gracefully ignore the new ``--liveserver`` option introduced in Django 1.4;
+  don't let it through to nose. (Adam DePue)
+
+1.0 (2012-03-12)
+~~~~~~~~~~~~~~~~
+* New fixture-bundling plugin for avoiding needless fixture setup (Erik Rose)
+* Moved FastFixtureTestCase in from test-utils, so now all the
+  fixture-bundling stuff is in one library. (Erik Rose)
+* Added the REUSE_DB setting for faster startup and shutdown. (Erik Rose)
+* Fixed a crash when printing options with certain verbosities. (Daniel Abel)
+* Broke hard dependency on MySQL. Support PostgreSQL. (Roger Hu)
+* Support SQLite, both memory- and disk-based. (Roger Hu and Erik Rose)
+* Nail down versions of the package requirements. (Daniel Mizyrycki)
+
+.. Omit older changes from package
+
+0.1.3 (2010-04-15)
+~~~~~~~~~~~~~~~~~~
+* Even better coverage support (rozza)
+* README fixes (carljm and ionelmc)
+* optparse OptionGroups are handled better (outofculture)
+* nose plugins are loaded before listing options
+
+0.1.2 (2010-08-14)
+~~~~~~~~~~~~~~~~~~
+* run_tests API support (carjm)
+* better coverage numbers (rozza & miracle2k)
+* support for adding custom nose plugins (kumar303)
+
+0.1.1 (2010-06-01)
+~~~~~~~~~~~~~~~~~~
+* Cleaner installation (Michael Fladischer)
+
+0.1 (2010-05-18)
+~~~~~~~~~~~~~~~~
+* Class-based test runner (Antti Kaihola)
+* Django 1.2 compatibility (Antti Kaihola)
+* Mapping Django verbosity to nose verbosity
+
+0.0.3 (2009-12-31)
+~~~~~~~~~~~~~~~~~~
+* Python 2.4 support (Blake Winton)
+* GeoDjango spatial database support (Peter Baumgartner)
+* Return the number of failing tests on the command line
+
+0.0.2 (2009-10-01)
+~~~~~~~~~~~~~~~~~~
+* rst readme (Rob Madole)
+
+0.0.1 (2009-10-01)
+~~~~~~~~~~~~~~~~~~
+* birth!
diff --git a/changelog.txt b/changelog.txt
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -0,0 +1 @@
+.. include:: ../changelog.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -7,6 +7,14 @@ django-nose
 .. include:: ../README.rst
     :start-after: .. Omit badges from docs
 
+Contents
+--------
+
+.. toctree::
+   :maxdepth: 2
+
+   changelog
+
 Indices and tables
 ------------------
 

diff --git a/setup.py b/setup.py
@@ -8,19 +8,29 @@
 def get_long_description(title):
     """Create the long_description from other files."""
     ROOT = os.path.abspath(os.path.dirname(__file__))
-    readme = open(os.path.join(ROOT, 'README.rst'), 'r', 'utf8').read()
 
+    readme = open(os.path.join(ROOT, 'README.rst'), 'r', 'utf8').read()
     body_tag = ".. Omit badges from docs"
     readme_body_start = readme.index(body_tag)
     assert readme_body_start
     readme_body = readme[readme_body_start + len(body_tag):]
 
+    changelog = open(os.path.join(ROOT, 'changelog.rst'), 'r', 'utf8').read()
+    old_tag = ".. Omit older changes from package"
+    changelog_body_end = changelog.index(old_tag)
+    assert changelog_body_end
+    changelog_body = changelog[:changelog_body_end]
+
     bars = '=' * len(title)
     long_description = """
 %(bars)s
 %(title)s
 %(bars)s
 %(readme_body)s
+
+%(changelog_body)s
+
+_(Older changes can be found in the full documentation)._
 """ % locals()
     return long_description