Skip to content

Commit

Permalink
fix doc build for readthedocs.org
Browse files Browse the repository at this point in the history
  • Loading branch information
dhellmann committed Feb 27, 2011
1 parent f160690 commit c110861
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 5 deletions.
14 changes: 14 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
2011-02-26 Doug Hellmann <[email protected]>

* virtualenvwrapper/version.py: Put the version info inside the
package so it is available to the doc build and packaging
script. This also makes the readthedocs.org build work properly.

* setup.py: Import the version information from the package.

* docs/sphinx/conf.py: Import the version information from the
package.

* Makefile: Remove rule to get the version from the installer for
the doc build.

2011-01-24 Doug Hellmann <[email protected]>

* virtualenvwrapper.sh: Replace hard-coded name "virtualenv" with
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Get the version of the app. This is used in the doc build.
export VERSION=$(shell python setup.py --version)

# Default target is to show help
help:
@echo "sdist - Source distribution"
Expand Down
3 changes: 2 additions & 1 deletion docs/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
# built documents.
#
# The short X.Y version.
version = os.environ['VERSION']
import virtualenvwrapper.version
version = virtualenvwrapper.version.VERSION
# The full version, including alpha/beta/rc tags.
release = version

Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/usr/bin/env python

import virtualenvwrapper.version

PROJECT = 'virtualenvwrapper'
VERSION = '2.6.1'
VERSION = virtualenvwrapper.version.VERSION

# Bootstrap installation of Distribute
import distribute_setup
Expand Down
9 changes: 9 additions & 0 deletions virtualenvwrapper/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env python
# encoding: utf-8
#
# Copyright (c) 2011 Doug Hellmann. All rights reserved.
#
"""Version info for virtualenvwrapper base system.
"""

VERSION = '2.6.2'

0 comments on commit c110861

Please sign in to comment.