[Python-modules-commits] [python-virtualenv] 01/08: Import python-virtualenv_15.0.2+ds.orig.tar.gz
Barry Warsaw
barry at moszumanska.debian.org
Mon Jun 20 13:43:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository python-virtualenv.
commit 1175831e56a1b3ff31efe3b94b91b9752f3275ff
Author: Barry Warsaw <barry at python.org>
Date: Mon Jun 20 09:35:44 2016 -0400
Import python-virtualenv_15.0.2+ds.orig.tar.gz
---
PKG-INFO | 24 ++++++++---------
bin/rebuild-script.py | 13 +++++++---
docs/changes.rst | 11 ++++++++
docs/userguide.rst | 2 +-
setup.cfg | 2 +-
virtualenv.egg-info/PKG-INFO | 24 ++++++++---------
virtualenv.egg-info/SOURCES.txt | 4 +--
virtualenv.py | 54 +++++++++++++++++++++++++--------------
virtualenv_embedded/activate.fish | 2 +-
9 files changed, 81 insertions(+), 55 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index dbfda64..fe3d773 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: virtualenv
-Version: 15.0.1
+Version: 15.0.2
Summary: Virtual Python Environment builder
Home-page: https://virtualenv.pypa.io/
Author: Jannis Leidel, Carl Meyer and Brian Rosner
@@ -47,29 +47,25 @@ Description: Virtualenv
Release History
===============
- 15.0.1 (2016-03-17)
+ 15.0.2 (2016-05-28)
-------------------
- * Print error message when DEST_DIR exists and is a file
+ * Copy Tcl/Tk libs on Windows to allow them to run,
+ fixes #93 (PR #888)
- * Upgrade setuptools to 20.3
+ * Upgrade setuptools to 21.2.1.
- * Upgrade pip to 8.1.1.
+ * Upgrade pip to 8.1.2.
- 15.0.0 (2016-03-05)
+ 15.0.1 (2016-03-17)
-------------------
- * Remove the `virtualenv-N.N` script from the package; this can no longer be
- correctly created from a wheel installation.
- Resolves #851, #692
-
- * Remove accidental runtime dependency on pip by extracting certificate in the
- subprocess.
+ * Print error message when DEST_DIR exists and is a file
- * Upgrade setuptools 20.2.2.
+ * Upgrade setuptools to 20.3
- * Upgrade pip to 8.1.0.
+ * Upgrade pip to 8.1.1.
`Full Changelog <https://virtualenv.pypa.io/en/latest/changes.html>`_.
diff --git a/bin/rebuild-script.py b/bin/rebuild-script.py
index a816af3..d0bc93e 100755
--- a/bin/rebuild-script.py
+++ b/bin/rebuild-script.py
@@ -7,7 +7,13 @@ from __future__ import print_function
import os
import re
import codecs
-from zlib import crc32
+from zlib import crc32 as _crc32
+
+
+def crc32(data):
+ """Python version idempotent"""
+ return _crc32(data) & 0xffffffff
+
here = os.path.dirname(__file__)
script = os.path.join(here, '..', 'virtualenv.py')
@@ -20,6 +26,7 @@ file_regex = re.compile(
re.S)
file_template = b'##file %(filename)s\n%(varname)s = convert("""\n%(data)s""")'
+
def rebuild(script_path):
with open(script_path, 'rb') as f:
script_content = f.read()
@@ -42,12 +49,12 @@ def rebuild(script_path):
new_data = b64.encode(gzip.encode(embedded)[0])[0]
if new_data == data:
- print(' File up to date (crc: %s)' % new_crc)
+ print(' File up to date (crc: %08x)' % new_crc)
parts += [match.group(0)]
continue
# Else: content has changed
crc = crc32(gzip.decode(b64.decode(data)[0])[0])
- print(' Content changed (crc: %s -> %s)' %
+ print(' Content changed (crc: %08x -> %08x)' %
(crc, new_crc))
new_match = file_template % {
b'filename': filename,
diff --git a/docs/changes.rst b/docs/changes.rst
index 2df19f6..3622b4c 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -1,6 +1,17 @@
Release History
===============
+15.0.2 (2016-05-28)
+-------------------
+
+* Copy Tcl/Tk libs on Windows to allow them to run,
+ fixes :issue:`93` (:pull:`888`)
+
+* Upgrade setuptools to 21.2.1.
+
+* Upgrade pip to 8.1.2.
+
+
15.0.1 (2016-03-17)
-------------------
diff --git a/docs/userguide.rst b/docs/userguide.rst
index 35f0dc9..c3eb031 100644
--- a/docs/userguide.rst
+++ b/docs/userguide.rst
@@ -112,7 +112,7 @@ below.
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
+ be run, but you will be prompted 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).
diff --git a/setup.cfg b/setup.cfg
index 6662fa5..6f08d0e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
universal = 1
[egg_info]
-tag_date = 0
tag_build =
+tag_date = 0
tag_svn_revision = 0
diff --git a/virtualenv.egg-info/PKG-INFO b/virtualenv.egg-info/PKG-INFO
index dbfda64..fe3d773 100644
--- a/virtualenv.egg-info/PKG-INFO
+++ b/virtualenv.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: virtualenv
-Version: 15.0.1
+Version: 15.0.2
Summary: Virtual Python Environment builder
Home-page: https://virtualenv.pypa.io/
Author: Jannis Leidel, Carl Meyer and Brian Rosner
@@ -47,29 +47,25 @@ Description: Virtualenv
Release History
===============
- 15.0.1 (2016-03-17)
+ 15.0.2 (2016-05-28)
-------------------
- * Print error message when DEST_DIR exists and is a file
+ * Copy Tcl/Tk libs on Windows to allow them to run,
+ fixes #93 (PR #888)
- * Upgrade setuptools to 20.3
+ * Upgrade setuptools to 21.2.1.
- * Upgrade pip to 8.1.1.
+ * Upgrade pip to 8.1.2.
- 15.0.0 (2016-03-05)
+ 15.0.1 (2016-03-17)
-------------------
- * Remove the `virtualenv-N.N` script from the package; this can no longer be
- correctly created from a wheel installation.
- Resolves #851, #692
-
- * Remove accidental runtime dependency on pip by extracting certificate in the
- subprocess.
+ * Print error message when DEST_DIR exists and is a file
- * Upgrade setuptools 20.2.2.
+ * Upgrade setuptools to 20.3
- * Upgrade pip to 8.1.0.
+ * Upgrade pip to 8.1.1.
`Full Changelog <https://virtualenv.pypa.io/en/latest/changes.html>`_.
diff --git a/virtualenv.egg-info/SOURCES.txt b/virtualenv.egg-info/SOURCES.txt
index 2524b15..18ebd31 100644
--- a/virtualenv.egg-info/SOURCES.txt
+++ b/virtualenv.egg-info/SOURCES.txt
@@ -40,6 +40,6 @@ virtualenv_embedded/python-config
virtualenv_embedded/site.py
virtualenv_support/__init__.py
virtualenv_support/argparse-1.4.0-py2.py3-none-any.whl
-virtualenv_support/pip-8.1.1-py2.py3-none-any.whl
-virtualenv_support/setuptools-20.3-py2.py3-none-any.whl
+virtualenv_support/pip-8.1.2-py2.py3-none-any.whl
+virtualenv_support/setuptools-21.2.1-py2.py3-none-any.whl
virtualenv_support/wheel-0.29.0-py2.py3-none-any.whl
\ No newline at end of file
diff --git a/virtualenv.py b/virtualenv.py
index 13146f6..fb9337f 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -36,7 +36,7 @@ try:
except ImportError:
import configparser as ConfigParser
-__version__ = "15.0.1"
+__version__ = "15.0.2"
virtualenv_version = __version__ # legacy
if sys.version_info < (2, 6):
@@ -161,6 +161,11 @@ if is_pypy:
# during the bootstrap
REQUIRED_MODULES.extend(['traceback', 'linecache'])
+ if majver == 3:
+ # _functools is needed to import locale during stdio initialization and
+ # needs to be copied on PyPy because it's not built in
+ REQUIRED_MODULES.append('_functools')
+
class Logger(object):
@@ -297,7 +302,7 @@ class Logger(object):
else:
return level >= consumer_level
- #@classmethod
+ @classmethod
def level_for_integer(cls, level):
levels = cls.LEVELS
if level < 0:
@@ -306,8 +311,6 @@ class Logger(object):
return levels[-1]
return levels[level]
- level_for_integer = classmethod(level_for_integer)
-
# create a silent logger just to prevent this from being undefined
# will be overridden with requested verbosity main() is called.
logger = Logger([(Logger.LEVELS[-1], sys.stdout)])
@@ -1062,6 +1065,16 @@ def copy_required_modules(dst_prefix, symlink):
if os.path.exists(pyfile):
copyfile(pyfile, dst_filename[:-1], symlink)
+def copy_tcltk(src, dest, symlink):
+ """ copy tcl/tk libraries on Windows (issue #93) """
+ if majver == 2:
+ libver = '8.5'
+ else:
+ libver = '8.6'
+ for name in ['tcl', 'tk']:
+ srcdir = src + '/tcl/' + name + libver
+ dstdir = dest + '/tcl/' + name + libver
+ copyfileordir(srcdir, dstdir, symlink)
def subst_path(prefix_path, prefix, home_dir):
prefix_path = os.path.normpath(prefix_path)
@@ -1118,6 +1131,9 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
copy_required_modules(home_dir, symlink)
finally:
logger.indent -= 2
+ # ...copy tcl/tk
+ if is_win:
+ copy_tcltk(prefix, home_dir, symlink)
mkdir(join(lib_dir, 'site-packages'))
import site
site_filename = site.__file__
@@ -1965,21 +1981,21 @@ VzsV75usvTdYef+57v5n1b225qhXfwEmxHEs
##file activate.fish
ACTIVATE_FISH = convert("""
-eJyFVVFv0zAQfs+vONJO3RDNxCsSQoMVrdK2Vl03CSHkesllMXLsYDvZivjx2GmTOG0YfWhV+7u7
-73z33Y1gnTENKeMIeakNPCKUGhP7xcQTbCJ4ZOKcxoZV1GCUMp1t4O0zMxkTQEGVQjicO4dTyIwp
-Ppyfu386Q86jWOZwBhq1ZlK8jYIRXEoQ0jhDYAYSpjA2fBsFQVoKG0UKSLAJB9MEJrMXi6uYMiXl
-KCrIZYJARQIKTakEGAkmQ+tU5ZSDRTAlRY7CRJMA7GdkgRoNSJ74t1BRxegjR12jWAoGbfpTAeGY
-LK4vycN8tb6/uCbLi/VVWGPcx3maPr2AO4VjYB+HMAxAkQT/i/ptfbW4vVrczAZit3eHDNqL13n0
-Ya+w+Tq/uyLL1eJmuSaLh9lqNb/0+IzgznqnAjAvzBa4jG0BNmNXfdJUkxTU2I6xRaKcy+e6VApz
-WVmoTGFTgwslrYdN03ONrbbMN1E/FQ7H7gOP0UxRjV67TPRBjF3naCMV1mSkYk9MUN7F8cODZzsE
-iIHYviIe6n8WeGQxWKuhl+9Xa49uijq7fehXMRxT9VR9f/8jhDcfYSKkSOyxKp22cNIrIk+nzd2b
-Yc7FNpHx8FUn15ZfzXEE98JxZEohx4r6kosCT+R9ZkHQtLmXGYSEeH8JCTvYkcRgXAutp9Rw7Jmf
-E/J5fktuL25m1tMe3vLdjDt9bNxr2sMo2P3C9BccqGeYhqfQITz6XurXaqdf99LF1mT2YJrvzqCu
-5w7dKvV3PzNyOb+7+Hw923dOuB+AX2SxrZs9Lm0xbCH6kmhjUyuWw+7cC7DX8367H3VzDz6oBtty
-tMIeobE21JT6HaRS+TbaoqhbE7rgdGs3xtE4cOF3xo0TfxwsdyRlhUoxuzes18r+Jp88zDx1G+kd
-/HTrr1BY2CeuyfnbQtAcu9j+pOw6cy9X0k3IuoyKCZPC5ESf6MkgHE5tLiSW3Oa+W2NnrQfkGv/h
-7tR5PNFnMBlw4B9NJTxnzKA9fLTT0aXSb5vw7FUKzcTZPddqYHi2T9/axJmEEN3qHncVCuEPaFmq
-uEtpcBj2Z1wjrqGReJBHrY6/go21NA==
+eJyFVVFv2zYQftevuMoOnBS1gr0WGIZ08RADSRw4boBhGGhGOsUcKFIjKbUu9uN7lC2JsrXWDzZM
+fnf38e6+uwlsdsJCLiRCUVkHrwiVxYy+hHqDbQKvQl3z1ImaO0xyYXdbeP9FuJ1QwMFUSnmcP4dL
+2DlXfry+9v/sDqVMUl3AFVi0Vmj1PokmcKtBaecNQTjIhMHUyX0SRXmlKIpWkGEbDuYZzBZfCVcL
+4youUdVQ6AyBqwwMusoocBrcDsmpKbgEQgijVYHKJbMI6DMhoEUHWmbhLdTcCP4q0TYokYNDev5c
+QTxlq/tb9rJcbz7f3LOnm81d3GD8x3uav30FfwrnwCEOYRyAKot+FvXPzd3q8W71sBiJ3d2dMugu
+fsxjCPsBmz+Wz3fsab16eNqw1ctivV7eBnwm8EzeuQIsSrcHqVMqwHbqq8/aarKSO+oYKhKXUn9p
+SmWw0DVBdQ7bBlwaTR62bc+1tpaYb5PhUyScu48CRgvDLQbtMrMnMQ6dY5022JDRRrwJxWUfJwwP
+ge0YIAVGfcUC1M8s8MxitFZjmR9W64hui7p4fBlWMZ5y81b/9cvfMbz7FWZKq4yOTeW1hbNBEWU+
+b+/ejXMu95lOx696uXb8Go4T+Kw8R2EMSqx5KLkkCkQ+ZBZFbZsHL4OYseAvY3EPO5MYTBuhDZQa
+TwPza8Y+LR/Z483Dgjwd4R3f7bTXx9Znkw6T6PAL83/hRD3jNAKFjuEx9NJkq5t+fabLvdvRwbw4
+nEFTzwO6U+q34cvY7fL55tP94tg58XEA/q7LfdPsaUXFoEIMJdHF5iSW0+48CnDQ82G7n3XzAD6q
+Bmo5XuOA0NQ67ir7AXJtQhtLKO7XhC0l39PGOBsHPvzBuHUSjoOnA0ldozGC9gZ5rek3+y3ALHO/
+kT7AP379lQZLSnFDLtwWihfYxw4nZd+ZR7myfkI2ZTRCuRxmF/bCzkbhcElvYamW9PbDGrvqPKC0
++D/uLi/sFcxGjOHylYagZzzsjjhw206RQwrWIwOxS2dnk+40xOjX8bTPegz/gdWVSXuaowNuOLda
+wYyNuRPSTcd/B48Ppeg=
""")
##file activate.csh
diff --git a/virtualenv_embedded/activate.fish b/virtualenv_embedded/activate.fish
index f3d1797..818739e 100644
--- a/virtualenv_embedded/activate.fish
+++ b/virtualenv_embedded/activate.fish
@@ -64,7 +64,7 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
if test -n "__VIRTUAL_PROMPT__"
printf '%s%s' "__VIRTUAL_PROMPT__" (set_color normal)
else
- printf '%s(%s%s%s) ' (set_color normal) (set_color -o white) (basename "$VIRTUAL_ENV") (set_color normal)
+ printf '%s(%s) ' (set_color normal) (basename "$VIRTUAL_ENV")
end
# Restore the original $status
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-virtualenv.git
More information about the Python-modules-commits
mailing list