Permalink
Browse files

Merge branch 'master' into develop

Conflicts:
	virtualenv.py
  • Loading branch information...
dstufft committed Jan 21, 2014
2 parents 155abb6 + 9e7401c commit e578a632a8dbc0818ab63dde84688769cf630b52
View
@@ -1,22 +1,26 @@
language: python
-python:
- - "2.6"
- - "2.7"
- - "3.2"
- - "3.3"
- - "pypy"
+
+env:
+ - TOXENV=py26
+ - TOXENV=py27
+ - TOXENV=py32
+ - TOXENV=py33
+ - TOXENV=py34
+ - TOXENV=pypy
+
install:
- - pip install --use-mirrors nose coverage
-script:
- - coverage erase
-# Unit tests
- - coverage run -a setup.py test
-# Integration test
- - coverage run -a virtualenv.py ./test-venv-01
-# How was our test coverage?
- - coverage report --show-missing
+ - "if [[ $TOXENV == 'py34' ]]; then .travis/py34.sh; fi"
+ - pip install tox
+
+script: tox
+
+branches:
+ only:
+ - master
+ - develop
+ - 1.9.X
+ - 1.10.X
+ - 1.11.X
+
notifications:
- irc:
- channels: "irc.freenode.org#pip"
- on_success: change
- on_failure: change
+ irc: "irc.freenode.org#pip"
View
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Get the Source Code
+cd ..
+hg clone http://hg.python.org/cpython
+
+# Build Python
+cd cpython
+./configure
+make -j8
+sudo make install
View
@@ -14,6 +14,17 @@ Changes & News
``$ENV/bin/python`` and re-running virtualenv on the same target directory
with the upgraded Python.
+
+1.11.1 (2014-01-20)
+~~~~~~~~~~~~~~~~~~~
+
+* Fixed an issue where pip and setuptools were not getting installed when using
+ the ``--system-site-packages`` flag.
+* Updated setuptools to fix an issue when installed with easy_install
+* Fixed an issue with Python 3.4 and sys.stdout encoding being set to ascii
+* Upgraded pip to v1.5.1
+* Upgraded setuptools to v2.1
+
1.11 (2014-01-02)
~~~~~~~~~~~~~~~~~
@@ -25,6 +36,7 @@ Changes & News
extra directories to search for compatible wheels for pip and setuptools.
The actual wheel selected is chosen based on version and compatibility, using
the same algorithm as ``pip install setuptools``.
+* Fixed #495, --always-copy was failing (#PR 511)
* Upgraded pip to v1.5
* Upgraded setuptools to v1.4
View
@@ -508,7 +508,7 @@ deployment use one of these tools.
Contributing
------------
-Refer to the `contributing to pip`_ documentation - it applies equally to
+Refer to the `pip development`_ documentation - it applies equally to
virtualenv, except that virtualenv issues should filed on the `virtualenv
repo`_ at GitHub.
@@ -523,7 +523,7 @@ changes any file in `virtualenv_embedded/`, run `bin/rebuild-script.py` to
update the embedded version of that file in `virtualenv.py`; commit that and
submit it as part of your patch / pull request.
-.. _contributing to pip: http://www.pip-installer.org/en/latest/contributing.html
+.. _pip development: http://www.pip-installer.org/en/latest/development.html
.. _virtualenv repo: https://github.com/pypa/virtualenv/
Running the tests
View
11 tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist =
+ py26,py27,py32,py33,pypy
+
+[testenv]
+deps =
+ nose
+ mock
+commands =
+ nosetests -v tests
+ python virtualenv.py {envtmpdir}/test-venv-01
View
@@ -280,7 +280,11 @@ def get_installed_pythons():
#"zipfile",
])
if minver >= 4:
- REQUIRED_MODULES.extend(['operator', '_collections_abc'])
+ REQUIRED_MODULES.extend([
+ 'operator',
+ '_collections_abc',
+ '_bootlocale',
+ ])
if is_pypy:
# these are needed to correctly display the exceptions that may happen
@@ -936,7 +940,7 @@ def install_wheel(project_names, py_executable, search_dirs=None):
cmd = [
py_executable, '-c',
- 'import sys, pip; pip.main(["install"] + sys.argv[1:])',
+ 'import sys, pip; sys.exit(pip.main(["install", "--ignore-installed"] + sys.argv[1:]))',
] + project_names
logger.start_progress('Installing %s...' % (', '.join(project_names)))
logger.indent += 2
@@ -1240,7 +1244,7 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
# OS X framework builds cause validation to break
# https://github.com/pypa/virtualenv/issues/322
if os.environ.get('__PYVENV_LAUNCHER__'):
- os.unsetenv('__PYVENV_LAUNCHER__')
+ del os.environ["__PYVENV_LAUNCHER__"]
if re.search(r'/Python(?:-32|-64)*$', py_executable):
# The name of the python executable is not quite what
# we want, rename it.

0 comments on commit e578a63

Please sign in to comment.