1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00

merge from ianb

This commit is contained in:
Carl Meyer 2009-09-04 15:29:15 -04:00
commit 81e1435edd
3 changed files with 11 additions and 12 deletions

View file

@ -44,9 +44,8 @@ pip is meant to improve on easy_install. Some of the improvements:
* Maybe uninstallation will get added. (It might get added to easy_install, * Maybe uninstallation will get added. (It might get added to easy_install,
but I think the chance for pip is higher.) but I think the chance for pip is higher.)
Also, pip will eventually be merged directly with pip, making it * Simple to define fixed sets of requirements and reliably reproduce a
simple to define fixed sets of requirements and reliably reproduce a set of set of packages.
packages.
pip is complementary with `virtualenv pip is complementary with `virtualenv
<http://pypi.python.org/pypi/virtualenv>`_, and it is encouraged that you use <http://pypi.python.org/pypi/virtualenv>`_, and it is encouraged that you use

View file

@ -7,11 +7,11 @@ tip
* Added ability to override the default log file name (``pip-log.txt``) * Added ability to override the default log file name (``pip-log.txt``)
with the environmental variable ``$PIP_LOG_FILE``. with the environmental variable ``$PIP_LOG_FILE``.
* Made the freeze command to return the installed packages instead of * Made the freeze command print installed packages to stdout instead of
writing them to a file. Use simple redirection (e.g. writing them to a file. Use simple redirection (e.g.
``pip freeze > stable-req.txt``) to get a file with requirements. ``pip freeze > stable-req.txt``) to get a file with requirements.
* Fixed problem of freezing an editable packages from a Git repository. * Fixed problem with freezing editable packages from a Git repository.
* Added support for base URLs using ``<base href='...'>`` when parsing * Added support for base URLs using ``<base href='...'>`` when parsing
HTML pages. HTML pages.

View file

@ -101,23 +101,23 @@ Now what about Mercurial::
>>> reset_env() >>> reset_env()
>>> env = get_env() >>> env = get_env()
>>> result = env.run('hg', 'clone', '-r', 'a5748745272a', 'http://bitbucket.org/mitsuhiko/pygments-main/', 'pygments') >>> result = env.run('hg', 'clone', '-r', 'f8f7eaf275c5', 'http://bitbucket.org/jezdez/django-dbtemplates/', 'django-dbtemplates')
>>> result = env.run(os.path.join(env.base_path, 'bin/python'), 'setup.py', 'develop', >>> result = env.run(os.path.join(env.base_path, 'bin/python'), 'setup.py', 'develop',
... cwd=os.path.join(env.base_path, 'pygments')) ... cwd=os.path.join(env.base_path, 'django-dbtemplates'))
>>> result = run_pip('freeze', expect_stderr=True) >>> result = run_pip('freeze', expect_stderr=True)
>>> print result >>> print result
Script result: ...ython... ../../pip.py -E .../test-scratch freeze Script result: ...ython... ../../pip.py -E .../test-scratch freeze
-- stdout: -------------------- -- stdout: --------------------
-e hg+http://bitbucket.org/mitsuhiko/pygments-main/@...#egg=Pygments-... -e hg+http://bitbucket.org/jezdez/django-dbtemplates/@...#egg=django_dbtemplates-...
... ...
<BLANKLINE> <BLANKLINE>
>>> result = run_pip('freeze', '-f', 'hg+http://bitbucket.org/mitsuhiko/pygments-main#egg=Pygments', expect_stderr=True) >>> result = run_pip('freeze', '-f', 'hg+http://bitbucket.org/jezdez/django-dbtemplates#egg=django_dbtemplates', expect_stderr=True)
>>> print result >>> print result
Script result: ...ython... ../../pip.py -E .../test-scratch freeze -f hg+http://bitbucket.org/mitsuhiko/pygments-main#egg=Pygments Script result: ...ython... ../../pip.py -E .../test-scratch freeze -f hg+http://bitbucket.org/jezdez/django-dbtemplates#egg=django_dbtemplates
-- stdout: -------------------- -- stdout: --------------------
-f hg+http://bitbucket.org/mitsuhiko/pygments-main#egg=Pygments -f hg+http://bitbucket.org/jezdez/django-dbtemplates#egg=django_dbtemplates
-e hg+http://bitbucket.org/mitsuhiko/pygments-main/@...#egg=Pygments-... -e hg+http://bitbucket.org/jezdez/django-dbtemplates/@...#egg=django_dbtemplates-...
... ...
<BLANKLINE> <BLANKLINE>