Merge branch 'release/1.7.1' into develop

pypa · Feb 16, 2012 · 9b70199 · 9b70199
2 parents 7a3de35 + 1607c9b
commit 9b70199
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 Copyright (c) 2007 Ian Bicking and Contributors
 Copyright (c) 2009 Ian Bicking, The Open Planning Project
-Copyright (c) 2011 The virtualenv developers
+Copyright (c) 2011-2012 The virtualenv developers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/docs/conf.py b/docs/conf.py
@@ -35,14 +35,14 @@
 
 # General substitutions.
 project = 'virtualenv'
-copyright = '2007-2011, Ian Bicking, The Open Planning Project, The virtualenv developers'
+copyright = '2007-2012, Ian Bicking, The Open Planning Project, The virtualenv developers'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
 #
 # The short X.Y version.
 
-release = "1.7"
+release = "1.7.1"
 version = ".".join(release.split(".")[:2])
 
 # There are two options for replacing |today|: either, you set today to some

diff --git a/docs/news.txt b/docs/news.txt
@@ -1,8 +1,8 @@
 Changes & News
 --------------
 
-In development
-~~~~~~~~~~~~~~
+1.7.1 (2012-02-16)
+~~~~~~~~~~~~~~~~~~
 
 * Update embedded pip to version 1.1.
 

diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@
 setup(name='virtualenv',
       # If you change the version here, change it in virtualenv.py and
       # docs/conf.py as well
-      version="1.7",
+      version="1.7.1",
       description="Virtual Python Environment builder",
       long_description=long_description,
       classifiers=[