Merge pull request pypa#14 from qwcode/version_example

qwcode · qwcode · commit 0bcad8578d6e · 2014-05-23T22:44:32.000-04:00
defer the topic of single-sourcing the version to the PPUG.
diff --git a/README.rst b/README.rst
@@ -1,6 +1,6 @@
 A sample Python project
 =======================
 
-This project aims to exemplify best practices for *packaging* Python
-projects. It is referred to in the `Python Packaging User Guide Tutorial
+A sample project that exists as an aid to the `Python Packaging User Guide
+Tutorial
 <https://python-packaging-user-guide.readthedocs.org/en/latest/tutorial.html>`_.
diff --git a/sample/__init__.py b/sample/__init__.py
@@ -1,5 +1,3 @@
-# The version should comply with PEP440
-__version__ = '1.2.0'
 
 def main():
     """Entry point for the application script"""
diff --git a/setup.py b/setup.py
@@ -3,8 +3,6 @@
 import os
 import re
 
-import sample
-
 here = os.path.abspath(os.path.dirname(__file__))
 
 # Get the long description from the relevant file
@@ -14,9 +12,10 @@
 setup(
     name="sample",
 
-    # There are various approaches to referencing the version. For a discussion,
-    # see http://packaging.python.org/en/latest/tutorial.html#version
-    version=sample.__version__,
+    # Versions should comply with PEP440.  For a discussion on single-sourcing
+    # the version across setup.py and the project code, see
+    # http://packaging.python.org/en/latest/tutorial.html#version
+    version='1.2.0',
 
     description="A sample Python project",
     long_description=long_description,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# The version should comply with PEP440`
`2`		`-__version__ = '1.2.0'`
`3`	`1`
`4`	`2`	`def main():`
`5`	`3`	`"""Entry point for the application script"""`