diff options
| -rw-r--r-- | coverage/__init__.py | 5 | ||||
| -rw-r--r-- | coverage/html.py | 2 | ||||
| -rw-r--r-- | coverage/htmlfiles/index.html | 2 | ||||
| -rw-r--r-- | coverage/version.py | 6 | ||||
| -rw-r--r-- | coverage/xmlreport.py | 5 | ||||
| -rw-r--r-- | setup.py | 4 |
6 files changed, 10 insertions, 14 deletions
diff --git a/coverage/__init__.py b/coverage/__init__.py index 21894364..4b3242f3 100644 --- a/coverage/__init__.py +++ b/coverage/__init__.py @@ -5,7 +5,10 @@ http://nedbatchelder.com/code/coverage """ -from coverage.version import __version__ +__version__ = "3.1b1" # see detailed history in CHANGES.txt + +__url__ = "http://nedbatchelder.com/code/coverage" + from coverage.control import coverage from coverage.data import CoverageData from coverage.cmdline import main, CoverageScript diff --git a/coverage/html.py b/coverage/html.py index 0c026de9..f096c728 100644 --- a/coverage/html.py +++ b/coverage/html.py @@ -1,7 +1,7 @@ """HTML reporting for Coverage.""" import keyword, os, re, token, tokenize, shutil -from coverage import __version__ # pylint: disable-msg=W0611 +from coverage import __url__, __version__ # pylint: disable-msg=W0611 from coverage.backward import StringIO # pylint: disable-msg=W0622 from coverage.report import Reporter from coverage.templite import Templite diff --git a/coverage/htmlfiles/index.html b/coverage/htmlfiles/index.html index 38928855..35659317 100644 --- a/coverage/htmlfiles/index.html +++ b/coverage/htmlfiles/index.html @@ -45,7 +45,7 @@ <div id='footer'>
<div class='content'>
<p>
- <a class='nav' href='http://nedbatchelder.com/code/coverage'>coverage v{{__version__}}</a>
+ <a class='nav' href='{{__url__}}'>coverage.py v{{__version__}}</a>
</p>
</div>
</div>
diff --git a/coverage/version.py b/coverage/version.py deleted file mode 100644 index 45f1b328..00000000 --- a/coverage/version.py +++ /dev/null @@ -1,6 +0,0 @@ -"""Coverage.py version number.""" - -# Because this file is imported by setup.py, which must run unchanged in both -# Python 2.x and 3.x, this file must be kept simple enough to run under both. - -__version__ = "3.1b1" # see detailed history in CHANGES.txt diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py index dbec7e92..0489384d 100644 --- a/coverage/xmlreport.py +++ b/coverage/xmlreport.py @@ -3,7 +3,7 @@ import os, sys import xml.dom.minidom -from coverage import __version__ +from coverage import __url__, __version__ from coverage.backward import sorted # pylint: disable-msg=W0622 from coverage.report import Reporter @@ -38,8 +38,7 @@ class XmlReporter(Reporter): root = self.xml_out.documentElement root.appendChild(self.xml_out.createComment( - " Generated by coverage.py %s: " - "http://nedbatchelder.com/code/coverage " % __version__ + " Generated by coverage.py %s: %s " % (__version__, __url__) )) packageXml = self.xml_out.createElement("packages") root.appendChild(packageXml) @@ -57,7 +57,7 @@ else: # Get or massage our metadata. -from coverage.version import __version__ +from coverage import __url__, __version__ doclines = __doc__.split('\n') @@ -98,7 +98,7 @@ setup( keywords = 'code coverage testing', license = 'BSD', classifiers = classifier_list, - url = 'http://nedbatchelder.com/code/coverage', + url = __url__, **more_setup_args ) |