[py-svn] commit/pytest: hpk42: upgrade inlined distribute_setup.py
Bitbucket
commits-noreply at bitbucket.org
Tue May 22 17:25:00 CEST 2012
1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/changeset/ad9fe504a371/
changeset: ad9fe504a371
user: hpk42
date: 2012-05-22 17:24:43
summary: upgrade inlined distribute_setup.py
affected #: 3 files
diff -r a233e29b19411b9906980dc963c374fa180c3875 -r ad9fe504a371ad8eb613052d58f229aa66f53527 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@
- fix issue #143: call unconfigure/sessionfinish always when
configure/sessionstart where called
- fix issue #144: better mangle test ids to junitxml classnames
+- upgrade distribute_setup.py to 0.6.27
Changes between 2.2.2 and 2.2.3
----------------------------------------
diff -r a233e29b19411b9906980dc963c374fa180c3875 -r ad9fe504a371ad8eb613052d58f229aa66f53527 distribute_setup.py
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -46,7 +46,7 @@
args = [quote(arg) for arg in args]
return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
-DEFAULT_VERSION = "0.6.24"
+DEFAULT_VERSION = "0.6.27"
DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
SETUPTOOLS_FAKED_VERSION = "0.6c11"
@@ -63,7 +63,7 @@
""" % SETUPTOOLS_FAKED_VERSION
-def _install(tarball):
+def _install(tarball, install_args=()):
# extracting the tarball
tmpdir = tempfile.mkdtemp()
log.warn('Extracting in %s', tmpdir)
@@ -81,7 +81,7 @@
# installing
log.warn('Installing Distribute')
- if not _python_cmd('setup.py', 'install'):
+ if not _python_cmd('setup.py', 'install', *install_args):
log.warn('Something went wrong during the installation.')
log.warn('See the error message above.')
finally:
@@ -306,6 +306,9 @@
log.warn('%s already exists', pkg_info)
return
+ if not os.access(pkg_info, os.W_OK):
+ log.warn("Don't have permissions to write %s, skipping", pkg_info)
+
log.warn('Creating %s', pkg_info)
f = open(pkg_info, 'w')
try:
@@ -474,11 +477,20 @@
else:
self._dbg(1, "tarfile: %s" % e)
+def _build_install_args(argv):
+ install_args = []
+ user_install = '--user' in argv
+ if user_install and sys.version_info < (2,6):
+ log.warn("--user requires Python 2.6 or later")
+ raise SystemExit(1)
+ if user_install:
+ install_args.append('--user')
+ return install_args
def main(argv, version=DEFAULT_VERSION):
"""Install or upgrade setuptools and EasyInstall"""
tarball = download_setuptools()
- _install(tarball)
+ _install(tarball, _build_install_args(argv))
if __name__ == '__main__':
diff -r a233e29b19411b9906980dc963c374fa180c3875 -r ad9fe504a371ad8eb613052d58f229aa66f53527 doc/announce/release-2.2.4.txt
--- a/doc/announce/release-2.2.4.txt
+++ b/doc/announce/release-2.2.4.txt
@@ -35,4 +35,5 @@
- fix issue #143: call unconfigure/sessionfinish always when
configure/sessionstart where called
- fix issue #144: better mangle test ids to junitxml classnames
+- upgrade distribute_setup.py to 0.6.27
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the pytest-commit
mailing list