Permalink
Browse files

Merge branch 'release/1.7.1'

  • Loading branch information...
2 parents 1405b48 + 1607c9b commit 7c5e2af85f567c50e15ab65745327207f3b62e08 @jezdez jezdez committed Feb 16, 2012
View
@@ -14,20 +14,30 @@ Contributors
------------
Alex Grönholm
+Anatoly Techtonik
Antonio Cuni
Armin Ronacher
+CBWhiz
Chris McDonough
Christian Stefanescu
Christopher Nilsson
+Cliff Xuan
Curt Micol
+Doug Hellmann
+Doug Napoleone
Douglas Creager
+Ethan Jucovy
Gunnlaugur Thor Briem
+Greg Haskins
+Jason R. Coombs
Jeff Hammel
+Jonathan Griffin
Jorge Vargas
Josh Bronson
Kumar McMillan
Lars Francke
Philip Jenvey
Ronny Pfannschmidt
+Stefano Rivera
Tarek Ziadé
Vinay Sajip
View
@@ -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
View
@@ -1,7 +1,7 @@
recursive-include docs *.txt
recursive-include scripts *
recursive-include virtualenv_support *.egg *.tar.gz
-recursive-exclude virtualenv_support *.py
+recursive-include virtualenv_embedded *
recursive-exclude docs/_templates *.*
include virtualenv_support/__init__.py
include *.py
View
@@ -29,7 +29,8 @@ def rebuild():
varname = match.group(2)
data = match.group(3)
print('Found reference to file %s' % filename)
- f = open(os.path.join(here, '..', 'virtualenv_support', filename), 'rb')
+ pathname = os.path.join(here, '..', 'virtualenv_embedded', filename)
+ f = open(pathname, 'rb')
c = f.read()
f.close()
new_data = c.encode('zlib').encode('base64')
@@ -11,27 +11,32 @@
import sys
here = os.path.dirname(__file__)
-support_files = os.path.join(here, '..', 'virtualenv_support')
+support_location = os.path.join(here, '..', 'virtualenv_support')
+embedded_location = os.path.join(here, '..', 'virtualenv_embedded')
-files = [
+embedded_files = [
('http://peak.telecommunity.com/dist/ez_setup.py', 'ez_setup.py'),
+ ('http://python-distribute.org/distribute_setup.py', 'distribute_setup.py'),
+]
+
+support_files = [
('http://pypi.python.org/packages/2.6/s/setuptools/setuptools-0.6c11-py2.6.egg', 'setuptools-0.6c11-py2.6.egg'),
('http://pypi.python.org/packages/2.5/s/setuptools/setuptools-0.6c11-py2.5.egg', 'setuptools-0.6c11-py2.5.egg'),
('http://pypi.python.org/packages/2.4/s/setuptools/setuptools-0.6c11-py2.4.egg', 'setuptools-0.6c11-py2.4.egg'),
- ('http://python-distribute.org/distribute_setup.py', 'distribute_setup.py'),
('http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz', 'distribute-0.6.24.tar.gz'),
- ('http://pypi.python.org/packages/source/p/pip/pip-1.0.2.tar.gz', 'pip-1.0.2.tar.gz'),
+ ('http://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz', 'pip-1.1.tar.gz'),
]
-def main():
+
+def refresh_files(files, location):
for url, filename in files:
sys.stdout.write('fetching %s ... ' % url)
sys.stdout.flush()
f = urlopen(url)
content = f.read()
f.close()
print('done.')
- filename = os.path.join(support_files, filename)
+ filename = os.path.join(location, filename)
if os.path.exists(filename):
f = open(filename, 'rb')
cur_content = f.read()
@@ -46,6 +51,11 @@ def main():
f.write(content)
f.close()
+
+def main():
+ refresh_files(embedded_files, embedded_location)
+ refresh_files(support_files, support_location)
+
if __name__ == '__main__':
main()
View
@@ -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
View
@@ -13,21 +13,10 @@ virtualenv
.. comment: split here
-Status and License
-------------------
-
-``virtualenv`` is a successor to `workingenv
-<http://cheeseshop.python.org/pypi/workingenv.py>`_, and an extension
-of `virtual-python
-<http://peak.telecommunity.com/DevCenter/EasyInstall#creating-a-virtual-python>`_.
-
-It was written by Ian Bicking, sponsored by the `Open Planning
-Project <http://openplans.org>`_ and is now maintained by a
-`group of developers <https://github.com/pypa/virtualenv/raw/master/AUTHORS.txt>`_.
-It is licensed under an
-`MIT-style permissive license <https://github.com/pypa/virtualenv/raw/master/LICENSE.txt>`_.
+Installation
+------------
-You can install it with ``pip install virtualenv``, or the `latest
+You can install virtualenv with ``pip install virtualenv``, or the `latest
development version <https://github.com/pypa/virtualenv/tarball/develop#egg=virtualenv-dev>`_
with ``pip install virtualenv==dev``.
@@ -37,7 +26,6 @@ it with ``python virtualenv.py``.
.. _virtualenv.py: https://raw.github.com/pypa/virtualenv/master/virtualenv.py
-
What It Does
------------
@@ -241,11 +229,12 @@ activate script
~~~~~~~~~~~~~~~
In a newly created virtualenv there will be a ``bin/activate`` shell
-script, or a ``Scripts/activate.bat`` batch file on Windows.
+script. For Windows systems, activation scripts are provided for CMD.exe
+and Powershell.
On Posix systems you can do::
- $ source bin/activate
+ $ source bin/activate
This will change your ``$PATH`` to point to the virtualenv's ``bin/``
directory. (You have to use ``source`` because it changes your shell
@@ -266,9 +255,65 @@ value before running the ``activate`` script.
On Windows you just do::
- > \path\to\env\Scripts\activate.bat
+ > \path\to\env\Scripts\activate
+
+And type `deactivate` to undo the changes.
+
+Based on your active shell (CMD.exe or Powershell.exe), Windows will use
+either activate.bat or activate.ps1 (as appropriate) to activate the
+virtual environment. If using Powershell, see the notes about code signing
+below.
+
+.. note::
+
+ If using Powershell, the ``activate`` script is subject to the
+ `execution policies`_ on the system. By default on Windows 7, the system's
+ excution policy is set to ``Restricted``, meaning no scripts like the
+ ``activate`` script are allowed to be executed. But that can't stop us
+ from changing that slightly to allow it to be executed.
+
+ In order to use the script, you have to relax your system's execution
+ policy to ``AllSigned``, meaning all scripts on the system must be
+ digitally signed to be executed. Since the virtualenv activation
+ script is signed by one of the authors (Jannis Leidel) this level of
+ the execution policy suffices. As an adminstrator run::
+
+ PS C:\> Set-ExecutionPolicy AllSigned
-And use ``deactivate.bat`` to undo the changes.
+ Then you'll be asked to trust the signer, when executing the script.
+ You will be prompted with the following::
+
+ PS C:\> virtualenv .\foo
+ New python executable in C:\foo\Scripts\python.exe
+ Installing setuptools................done.
+ Installing pip...................done.
+ PS C:\> .\foo\scripts\activate
+
+ Do you want to run software from this untrusted publisher?
+ File C:\foo\scripts\activate.ps1 is published by E=jannis@leidel.info,
+ CN=Jannis Leidel, L=Berlin, S=Berlin, C=DE, Description=581796-Gh7xfJxkxQSIO4E0
+ and is not trusted on your system. Only run scripts from trusted publishers.
+ [V] Never run [D] Do not run [R] Run once [A] Always run [?] Help
+ (default is "D"):A
+ (foo) PS C:\>
+
+ If you select ``[A] Always Run``, the certificate will be added to the
+ Trusted Publishers of your user account, and will be trusted in this
+ user's context henceforth. If you select ``[R] Run Once``, the script will
+ be run, but you will be prometed on a subsequent invocation. Advanced users
+ can add the signer's certificate to the Trusted Publishers of the Computer
+ account to apply to all users (though this technique is out of scope of this
+ document).
+
+ Alternatively, you may relax the system execution policy to allow running
+ of local scripts without verifying the code signature using the following::
+
+ PS C:\> Set-ExecutionPolicy RemoteSigned
+
+ Since the ``activate.ps1`` script is generated locally for each virtualenv,
+ it is not considered a remote script and can then be executed.
+
+.. _`execution policies`: http://technet.microsoft.com/en-us/library/dd347641.aspx
The ``--system-site-packages`` Option
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -381,7 +426,12 @@ provide an option ``--never-download`` like so::
If this option is provided, virtualenv will never try to download
setuptools/distribute or pip. Instead, it will exit with status code 1
if it fails to find local distributions for any of these required
-packages.
+packages. The local distribution lookup is done in this order and the
+following locations:
+ #. The current directory.
+ #. The directory where virtualenv.py is located.
+ #. A ``virtualenv_support`` directory relative to the directory where virtualenv.py is located.
+ #. If the file being executed is not named virtualenv.py (i.e. is a boot script), a ``virtualenv_support`` directory relative to wherever virtualenv.py is actually installed.
Compare & Contrast with Alternatives
------------------------------------
@@ -431,7 +481,7 @@ Virtualenv's release schedule is tied to pip's -- each time there's a new pip
release, there will be a new virtualenv release that bundles the new version of
pip.
-.. _contributing to pip: http://www.pip-installer.org/en/latest/how-to-contribute.html
+.. _contributing to pip: http://www.pip-installer.org/en/latest/contributing.html
Running the tests
~~~~~~~~~~~~~~~~~
@@ -485,3 +535,17 @@ Other Documentation and Links
* `virtualenv commands
<http://thisismedium.com/tech/extending-virtualenv/>`_ for some more
workflow-related tools around virtualenv.
+
+Status and License
+------------------
+
+``virtualenv`` is a successor to `workingenv
+<http://cheeseshop.python.org/pypi/workingenv.py>`_, and an extension
+of `virtual-python
+<http://peak.telecommunity.com/DevCenter/EasyInstall#creating-a-virtual-python>`_.
+
+It was written by Ian Bicking, sponsored by the `Open Planning
+Project <http://openplans.org>`_ and is now maintained by a
+`group of developers <https://github.com/pypa/virtualenv/raw/master/AUTHORS.txt>`_.
+It is licensed under an
+`MIT-style permissive license <https://github.com/pypa/virtualenv/raw/master/LICENSE.txt>`_.
View
@@ -1,10 +1,46 @@
Changes & News
--------------
+1.7.1 (2012-02-16)
+~~~~~~~~~~~~~~~~~~
+
+* Update embedded pip to version 1.1.
+
+* Fix `--relocatable` under Python 3. Thanks Doug Hellmann.
+
+* Added environ PATH modification to activate_this.py. Thanks Doug
+ Napoleone. Fixes #14.
+
+* Support creating virtualenvs directly from a Python build directory on
+ Windows. Thanks CBWhiz. Fixes #139.
+
+* Use non-recursive symlinks to fix things up for posix_local install
+ scheme. Thanks michr.
+
+* Made activate script available for use with msys and cygwin on Windows.
+ Thanks Greg Haskins, Cliff Xuan, Jonathan Griffin and Doug Napoleone.
+ Fixes #176.
+
+* Fixed creation of virtualenvs on Windows when Python is not installed for
+ all users. Thanks Anatoly Techtonik for report and patch and Doug
+ Napoleone for testing and confirmation. Fixes #87.
+
+* Fixed creation of virtualenvs using -p in installs where some modules
+ that ought to be in the standard library (e.g. `readline`) are actually
+ installed in `site-packages` next to `virtualenv.py`. Thanks Greg Haskins
+ for report and fix. Fixes #167.
+
+* Added activation script for Powershell (signed by Jannis Leidel). Many
+ thanks to Jason R. Coombs.
+
1.7 (2011-11-30)
~~~~~~~~~~~~~~~~
-* Updated embedded Distribute release to 0.6.24. Thanks Alex Grönholm.
+* Gave user-provided ``--extra-search-dir`` priority over default dirs for
+ finding setuptools/distribute (it already had priority for finding pip).
+ Thanks Ethan Jucovy.
+
+* Updated embedded Distribute release to 0.6.24. Thanks Alex Gronholm.
* Made ``--no-site-packages`` behavior the default behavior. The
``--no-site-packages`` flag is still permitted, but displays a warning when
View
@@ -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=[
Oops, something went wrong.

0 comments on commit 7c5e2af

Please sign in to comment.