merged from original

Author: t2y

.hgtags

@@ -66,3 +66,5 @@ f71ffbb996c41606aea15b2114120d9fca3adfc6 2.5.2
 dc74f106d8d2dd58031b2dbac31b1e068f780de4 2.5.3
 b0f27c65fa64627599c2a022a076ae5ee7157ae4 2.6
 445a58d5a05a1426cefb47e54b692b6a58fdcc4f 2.6.1
+625d85d3136ff746accc490c5f9210b1b0074533 2.6.2
+e7582879df06689ec54cd820c377e89114b75ee2 2.6.3

ChangeLog

@@ -1,3 +1,30 @@
+2011-02-26  Doug Hellmann  <[email protected]>
+
+	* docs/sphinx/conf.py: Just hard-code the version.
+
+	* setup.py: Just hard-code the version.
+
+	* 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
+	the variable VIRTUALENVWRAPPER_VIRTUALENV to allow tests (and
+	users) to override it.
+
+	* tests/test_mkvirtualenv.sh (test_virtualenv_fails): Add a test
+	to reproduce the conditions reported in issue #76.
+
 2010-12-27  Doug Hellmann  <[email protected]>
 
 	* virtualenvwrapper.sh (virtualenvwrapper_get_python_version):

Makefile

@@ -1,18 +1,14 @@
-# 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"
 	@echo "html           - HTML documentation"
 	@echo "docclean       - Remove documentation build files"
-	@echo "register       - register a new release on PyPI"
-	@echo "website        - build web version of docs"
-	@echo "installwebsite - deploy web version of docs"
+	@echo "upload         - upload a new release to PyPI"
 	@echo "develop        - install development version"
 	@echo "test           - run the test suite"
 	@echo "test-quick     - run the test suite for bash and one version of Python ($(PYTHON26))"
-
+	@echo "website        - generate web version of the docs"
+	@echo "installwebsite - copy web version of HTML docs up to server"
 
 .PHONY: sdist
 sdist: html
@@ -37,9 +33,9 @@ docclean:
 website: 
 	[ ~/Devel/doughellmann/doughellmann/templates/base.html -nt docs/sphinx/web/templates/base.html ] && (echo "Updating base.html" ; cp ~/Devel/doughellmann/doughellmann/templates/base.html docs/sphinx/web/templates/base.html) || exit 0
 	rm -rf docs/website
-	(cd docs && $(MAKE) html BUILDING_WEB=1 BUILDDIR="website/en" LANGUAGE="en")
-	(cd docs && $(MAKE) html BUILDING_WEB=1 BUILDDIR="website/es" LANGUAGE="es")
-	(cd docs && $(MAKE) html BUILDING_WEB=1 BUILDDIR="website/ja" LANGUAGE="ja")
+	(cd docs && $(MAKE) html BUILDDIR="website/en" LANGUAGE="en")
+	(cd docs && $(MAKE) html BUILDDIR="website/es" LANGUAGE="es")
+	(cd docs && $(MAKE) html BUILDDIR="website/ja" LANGUAGE="ja")
 
 installwebsite: website
 	(cd docs/website/en && rsync --rsh=ssh --archive --delete --verbose . www.doughellmann.com:/var/www/doughellmann/DocumentRoot/docs/virtualenvwrapper/)
@@ -49,8 +45,14 @@ installwebsite: website
 # Register the new version on pypi
 .PHONY: register
 register:
+	echo "USE upload target"
+	exit 1
 	python setup.py register
 
+.PHONY: upload
+upload:
+	python setup.py sdist upload
+
 # Testing
 test:
 	tox

docs/en/history.rst

@@ -2,11 +2,20 @@
 Release History
 ===============
 
-Dev
+2.6.3
 
+  - Hard-code the version information in the setup.py and conf.py
+    scripts so it works for http://readthedocs.org.
+
+2.6.2
+
+  - Attempted to make the doc build work with http://readthedocs.org.
   - Merged in `Japanese translation of the documentation
     <http://www.doughellmann.com/docs/virtualenvwrapper/ja/>`__ from
     Tetsuya Morimoto.
+  - Incorporate a suggestion from Ales Zoulek to let the user specify
+    the virtualenv binary through an environment variable
+    (``VIRTUALENVWRAPPER_VIRTUALENV``).
 
 2.6.1
 

docs/sphinx/conf.py

@@ -29,10 +29,7 @@
 bitbucket_project_url = 'http://bitbucket.org/dhellmann/virtualenvwrapper/'
 
 # Add any paths that contain templates here, relative to this directory.
-if building_web:
-    templates_path = ['web/templates']
-else:
-    templates_path = ['pkg/templates']
+#templates_path = ['pkg/templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -45,14 +42,14 @@
 
 # General information about the project.
 project = u'virtualenvwrapper'
-copyright = u'2009, Doug Hellmann'
+copyright = u'2009-2011, Doug Hellmann'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = os.environ['VERSION']
+version = '2.6.3'
 # The full version, including alpha/beta/rc tags.
 release = version
 
@@ -98,10 +95,7 @@
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-if building_web:
-    html_theme = 'default'
-else:
-    html_theme = 'sphinxdoc'
+html_theme = 'nature'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the