Skip to content

Commit c110861

Browse files
committed
fix doc build for readthedocs.org
1 parent f160690 commit c110861

File tree

5 files changed

+28
-5
lines changed

5 files changed

+28
-5
lines changed

ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2011-02-26 Doug Hellmann <[email protected]>
2+
3+
* virtualenvwrapper/version.py: Put the version info inside the
4+
package so it is available to the doc build and packaging
5+
script. This also makes the readthedocs.org build work properly.
6+
7+
* setup.py: Import the version information from the package.
8+
9+
* docs/sphinx/conf.py: Import the version information from the
10+
package.
11+
12+
* Makefile: Remove rule to get the version from the installer for
13+
the doc build.
14+
115
2011-01-24 Doug Hellmann <[email protected]>
216

317
* virtualenvwrapper.sh: Replace hard-coded name "virtualenv" with

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# Get the version of the app. This is used in the doc build.
2-
export VERSION=$(shell python setup.py --version)
3-
41
# Default target is to show help
52
help:
63
@echo "sdist - Source distribution"

docs/sphinx/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
# built documents.
5353
#
5454
# The short X.Y version.
55-
version = os.environ['VERSION']
55+
import virtualenvwrapper.version
56+
version = virtualenvwrapper.version.VERSION
5657
# The full version, including alpha/beta/rc tags.
5758
release = version
5859

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/usr/bin/env python
22

3+
import virtualenvwrapper.version
4+
35
PROJECT = 'virtualenvwrapper'
4-
VERSION = '2.6.1'
6+
VERSION = virtualenvwrapper.version.VERSION
57

68
# Bootstrap installation of Distribute
79
import distribute_setup

virtualenvwrapper/version.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env python
2+
# encoding: utf-8
3+
#
4+
# Copyright (c) 2011 Doug Hellmann. All rights reserved.
5+
#
6+
"""Version info for virtualenvwrapper base system.
7+
"""
8+
9+
VERSION = '2.6.2'

0 commit comments

Comments
 (0)